修复月台部分bug，修改锁定月台功能

xiaochaoqun
1 parent fb868b0b
Showing 4 changed files with 39 additions and 8 deletions
ant-design-vue-jeecg/src/api/api.js
ant-design-vue-jeecg/src/views/basics/platformmanagement/PlatformDetailsList.vue
ant-design-vue-jeecg/src/views/basics/platformmanagement/modules/PlatformDetailsModal.vue
ant-design-vue-jeecg/src/views/basics/platformmanagement/modules/PlatformManagementModal.vue
@@ -115,7 +115,7 @@ export const Platform = (params)=&gt;postAction(&quot;/platformmanagement/platformManage
 //释放月台
 export const releasePlatform = (params)=>postAction("/platformmanagement/platformManagement/releasePlatform?id="+params);
 //锁定月台
-export const bindPlatform = (params)=>postAction("/platformmanagement/platformManagement/bindPlatform?id="+params);
+export const bindPlatform = (params)=>postAction("/platformmanagement/platformManagement/bindPlatform", params);
  
 // 中转HTTP请求
 export const transitRESTful = {
@@ -77,7 +77,7 @@
             <a-popconfirm title="确定释放该月台吗?" @confirm="() => releaseClick(record.id)" v-if="record.state=='lock' || record.state=='reserve'">
               <a>释放</a>
             </a-popconfirm>
-            <a-popconfirm title="确定绑定该月台吗?" @confirm="() => bindClcik(record.id)" v-if="record.state=='empty' ">
+            <a-popconfirm title="确定绑定该月台吗?" @confirm="() => bindClcik(record.id)" v-if="record.state=='empty' || record.state== null">
               <a>绑定</a>
             </a-popconfirm>
             <a-divider type="vertical" />
@@ -94,6 +94,16 @@
     </div>
  
     <platformDetails-modal ref="modalForm" @ok="modalFormOk" :mainId="mainId"></platformDetails-modal>
+    <j-popup
+      v-show="showRentPrise"
+      ref="find_car_number"
+      code="find_car_number"
+      :param="Param"
+      :trigger-change="true"
+      @callback="findCarNumberClick"
+      org-fields="phone_number"
+      dest-fields="phone_number"
+      field="popup"/>
   </a-card>
 </template>
  
@@ -115,6 +125,7 @@
   export default {
     name: "PlatformDetailsList",
     mixins:[JeecgListMixin],
+    Param:{railway_platform:''},
     components: { PlatformDetailsModal },
     props:{
       mainId:{
@@ -140,6 +151,8 @@
       return {
         description: '月台管理页面',
         disableMixinCreated:true,
+        model:{
+        },
         // 表头
         columns: [
           {
@@ -233,7 +246,17 @@
         })
       },
       bindClcik(id){
-        bindPlatform(id).then((res) => {
+        this.$refs.find_car_number.openModal();
+        this.model.id = id;
+
+      },
+      findCarNumberClick(row){
+        let params = {
+          "id":this.model.id,
+          "carNumber":row.phone_number
+        }
+        debugger
+        bindPlatform(params).then((res) => {
           if (res.success) {
             this.$message.success(res.message);
             this.loadData(1);
@@ -12,7 +12,7 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item v-if="model.code==null" label="编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="code">
+            <a-form-model-item v-if="show" label="编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="code">
               <a-input v-model="model.code"placeholder="请输入编码"></a-input>
             </a-form-model-item>
           </a-col>
@@ -32,7 +32,7 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item v-if="model.state== null" label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
+            <a-form-model-item v-if="show" label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
               <j-dict-select-tag type="list" v-model="model.state" dictCode="platformstatus" placeholder="请选择状态" />
             </a-form-model-item>
           </a-col>
@@ -63,6 +63,7 @@
         title:"操作",
         width:800,
         visible: false,
+        show:true,
         model:{
         },
         labelCol: {
@@ -99,11 +100,14 @@
     },
     methods: {
       add () {
-        this.edit(this.modelDefault);
+        this.model = Object.assign({}, this.modelDefault);
+        this.visible = true;
+        this.show = true;
       },
       edit (record) {
         this.model = Object.assign({}, record);
         this.visible = true;
+        this.show = false;
       },
       close () {
         this.$emit('close');
@@ -12,7 +12,7 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="编码" v-if="model.code == null" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="code">
+            <a-form-model-item label="编码" v-if="codeView == true" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="code">
               <a-input v-model="model.code" placeholder="请输入编码" ></a-input>
             </a-form-model-item>
           </a-col>
@@ -66,6 +66,7 @@
         title:"操作",
         width:800,
         visible: false,
+        codeView: false,
         model:{
         },
         labelCol: {
@@ -102,9 +103,12 @@
     },
     methods: {
       add () {
-        this.edit(this.modelDefault);
+        this.model = Object.assign({}, this.modelDefault);
+        this.visible = true;
+        this.codeView =true;
       },
       edit (record) {
+        this.codeView =false;
         this.model = Object.assign({}, record);
         this.visible = true;
       },