zcy 4 år sedan
förälder
incheckning
a716de91b7

+ 45 - 27
src/views/basics/line/CheckAndEditModel.vue

@@ -8,15 +8,17 @@
     @close="close"
   >
     <a-form-model ref="form" :label-col="labelCol" :wrapper-col="wrapperCol" :rules="validatorRules" :model="model">
-      <a-form-model-item label="数据编号" prop="lineSjbh">
-        <a-input-number v-model="model.lineSjbh" style="width: 100%" />
-      </a-form-model-item>
+<!--      <a-form-model-item label="数据编号" prop="lineSjbh">-->
+<!--        <a-input-number v-model="model.lineSjbh" style="width: 100%" />-->
+<!--      </a-form-model-item>-->
       <a-form-model-item label="线路名称" prop="lineName">
         <a-input v-model="model.lineName" />
       </a-form-model-item>
-      <a-form-model-item label="所属车间" prop="deptId">
+      <a-form-model-item label="所属车间" prop="deptLines">
         <a-tree-select
-          v-model="model.deptId"
+          v-model="model.deptLines"
+          tree-checkable
+          :max-tag-count="5"
           :show-search="true"
           allow-clear
           tree-default-expand-all
@@ -33,24 +35,15 @@
       <!--          dict-code="xingbie"-->
       <!--        />-->
       <!--      </a-form-model-item>-->
-      <a-form-model-item label="上行起始公里标" prop="upStartMarker">
-        <a-input-number v-model="model.upStartMarker" style="width: 100%" />
-      </a-form-model-item>
-      <a-form-model-item label="上行结束公里标" prop="upEndMarker">
-        <a-input-number v-model="model.upEndMarker" style="width: 100%" />
+<!--      <a-form-model-item label="运营里程" prop="lineYylc">-->
+<!--        <a-input v-model="model.lineYylc" style="width: 100%" />-->
+<!--      </a-form-model-item>-->
+      <a-form-model-item label="开始公里标" prop="startMarker">
+        <a-input v-model="model.startMarker" style="width: 100%" />
       </a-form-model-item>
-      <a-form-model-item label="下行结束公里标" prop="downStartMarker">
-        <a-input-number v-model="model.downStartMarker" style="width: 100%" />
+      <a-form-model-item label="结束公里标" prop="endMarker">
+        <a-input v-model="model.endMarker" style="width: 100%" />
       </a-form-model-item>
-      <a-form-model-item label="下行起始公里标" prop="downEndMarker">
-        <a-input-number v-model="model.downEndMarker" style="width: 100%" />
-      </a-form-model-item>
-      <!--      <a-form-model-item label="开始公里标" prop="lineStartMarker">-->
-      <!--        <a-input v-model="model.lineStartMarker" style="width: 100%" />-->
-      <!--      </a-form-model-item>-->
-      <!--      <a-form-model-item label="结束公里标" prop="lineEndMarker">-->
-      <!--        <a-input v-model="model.lineEndMarker" style="width: 100%" />-->
-      <!--      </a-form-model-item>-->
     </a-form-model>
   </j-modal>
 </template>
@@ -74,14 +67,13 @@ export default {
       isCheck: false,
       model: {},
       validatorRules: {
-        lineSjbh: [{ required: true, message: '请输入' }],
+        // lineSjbh: [{ required: true, message: '请输入' }],
         lineName: [{ required: true, message: '请输入' }],
-        deptId: [{ required: true, message: '请选择' }],
+        deptLines: [{ required: true, message: '请选择' }],
         // xingbie: [{ required: true, message: '请选择' }],
-        upStartMarker: [{ required: true, message: '请输入' }],
-        upEndMarker: [{ required: true, message: '请输入' }]
-        // lineStartMarker: [{ required: true, message: '请输入' }],
-        // lineEndMarker: [{ required: true, message: '请输入' }]
+        // lineYylc: [{ required: true, message: '请输入' }],
+        startMarker: [{ required: true, message: '请输入' }],
+        endMarker: [{ required: true, message: '请输入' }]
 
       },
       url: {
@@ -109,6 +101,12 @@ export default {
     },
     edit(record) {
       this.model = Object.assign({}, record)
+      if (this.model.deptLines) {
+        debugger
+        this.model.deptLines = this.setDeptsToArr(this.model.deptLines)
+      } else {
+        this.model.deptLines = []
+      }
       this.visible = true
     },
     close(isSubmit) {
@@ -136,6 +134,11 @@ export default {
         url = this.url.edit
         type = 'put'
       }
+      if (this.model.deptLines) {
+        this.model.deptLines = this.setDeptsArrObj(this.model.deptLines)
+      } else {
+        this.model.deptLines = []
+      }
       httpAction(url, this.model, type).then((res) => {
         if (res.code === 200) {
           this.$message.success(res.msg)
@@ -145,6 +148,21 @@ export default {
           console.log(res)
         }
       })
+    },
+    setDeptsArrObj(depts) {
+      const obj = []
+      for (const item of depts) {
+        obj.push({ deptId: item })
+      }
+      debugger
+      return obj
+    },
+    setDeptsToArr(depts) {
+      const Arr = []
+      for (const item of depts) {
+        Arr.push(item.deptId)
+      }
+      return Arr
     }
   }
 }

+ 12 - 36
src/views/basics/line/indexColumns.js

@@ -9,12 +9,12 @@ function columns(vm) {
         return parseInt(index) + 1
       }
     },
-    {
-      title: '数据编号',
-      align: 'center',
-      dataIndex: 'lineSjbh',
-      key: 'lineSjbh'
-    },
+    // {
+    //   title: '数据编号',
+    //   align: 'center',
+    //   dataIndex: 'lineSjbh',
+    //   key: 'lineSjbh'
+    // },
     {
       title: '段别',
       align: 'center',
@@ -39,41 +39,17 @@ function columns(vm) {
     //   dataIndex: 'xingbieText',
     //   key: 'xingbieText'
     // },
-    // {
-    //   title: '开始公里标',
-    //   align: 'center',
-    //   dataIndex: 'lineStartMarker',
-    //   key: 'lineStartMarker'
-    // },
-    // {
-    //   title: '结束公里标',
-    //   align: 'center',
-    //   dataIndex: 'lineEndMarker',
-    //   key: 'lineEndMarker'
-    // },
-    {
-      title: '上行开始公里标',
-      align: 'center',
-      dataIndex: 'upStartMarker',
-      key: 'upStartMarker'
-    },
-    {
-      title: '上行结束公里标',
-      align: 'center',
-      dataIndex: 'upEndMarker',
-      key: 'upEndMarker'
-    },
     {
-      title: '下行开始公里标',
+      title: '开始公里标',
       align: 'center',
-      dataIndex: 'downStartMarker',
-      key: 'downStartMarker'
+      dataIndex: 'startMarker',
+      key: 'startMarker'
     },
     {
-      title: '下行结束公里标',
+      title: '结束公里标',
       align: 'center',
-      dataIndex: 'downEndMarker',
-      key: 'downEndMarker'
+      dataIndex: 'endMarker',
+      key: 'endMarker'
     },
     {
       title: '操作',

+ 29 - 3
src/views/basics/section/CheckAndEditModel.vue

@@ -11,9 +11,11 @@
       <a-form-model-item label="区间站场名称" prop="stationName">
         <a-input v-model="model.stationName" />
       </a-form-model-item>
-      <a-form-model-item label="所属车间" prop="deptId">
+      <a-form-model-item label="所属车间" prop="deptStations">
         <a-tree-select
-          v-model="model.deptId"
+          v-model="model.deptStations"
+          tree-checkable
+          :max-tag-count="5"
           :show-search="true"
           allow-clear
           tree-default-expand-all
@@ -74,7 +76,7 @@ export default {
       validatorRules: {
         stationName: [{ required: true, message: '请输入' }],
         lineId: [{ required: true, message: '请选择' }],
-        deptId: [{ required: true, message: '请选择' }],
+        deptStations: [{ required: true, message: '请选择' }],
         xingbie: [{ required: true, message: '请选择' }],
         stationId: [{ required: true, message: '请选择' }],
         startMarker: [{ required: true, message: '请输入' }],
@@ -106,6 +108,11 @@ export default {
     },
     edit(record) {
       this.model = Object.assign({}, record)
+      if (this.model.deptStations) {
+        this.model.deptStations = this.setDeptsToArr(this.model.deptStations)
+      } else {
+        this.model.deptStations = []
+      }
       this.visible = true
     },
     close(isSubmit) {
@@ -133,6 +140,11 @@ export default {
         url = this.url.edit
         type = 'put'
       }
+      if (this.model.deptStations) {
+        this.model.deptStations = this.setDeptsArrObj(this.model.deptStations)
+      } else {
+        this.model.deptStations = []
+      }
       httpAction(url, this.model, type).then((res) => {
         if (res.code === 200) {
           this.$message.success(res.msg)
@@ -142,6 +154,20 @@ export default {
           console.log(res)
         }
       })
+    },
+    setDeptsArrObj(depts) {
+      const obj = []
+      for (const item of depts) {
+        obj.push({ deptId: item })
+      }
+      return obj
+    },
+    setDeptsToArr(depts) {
+      const Arr = []
+      for (const item of depts) {
+        Arr.push(item.deptId)
+      }
+      return Arr
     }
   }
 }