更换备件

src/views/repair/application-form/modules/DetailRepair.vue

@@ -448,18 +448,22 @@ export default {
           title: '备件名称',
           dataIndex: 'spareName'
         },
+        {
+          title: '备件编码',
+          dataIndex: 'no'
+        },
         {
           title: '规格型号',
           dataIndex: 'ggxh'
         },
         {
-          title: '本次更换日期',
+          title: '更换日期',
           dataIndex: 'startDate'
         },
-        {
+        /* {
           title: '下次更换日期',
           dataIndex: 'startDate'
-        },
+        }, */
         {
           title: '更换备注',
           dataIndex: 'remark'

src/views/repair/application-form/modules/LongYanSelectSpareForm.vue

@@ -23,7 +23,7 @@
           </a-form-item>
         </row-item>
 
-        <row-item>
+<!--        <row-item>
           <a-form-item
             label="备件寿命"
             :labelCol="BaseTool.Constant.labelCol2"
@@ -45,7 +45,7 @@
               :rows="4"
               v-decorator="['remark']"/>
           </a-form-item>
-        </row-item>
+        </row-item>-->
       </row-list>
     </a-form>
     <template slot="footer">
@@ -84,6 +84,7 @@ export default {
   methods: {
     base (queryParam, model) {
       this.visible = true
+      this.spareName = null
       this.spareRows = []
       this.isSpecial = queryParam.isSpecial
       this.model = model
@@ -98,7 +99,7 @@ export default {
         }
         const data = []
         for (let i = 0; i < this.spareRows.length; i++) {
-          data.push({ remark: values.remark, sparePeriod: values.sparePeriod, isSpecial: this.isSpecial, sbId: this.model.sbId, spareId: this.spareRows[i].id, repairId: this.model.id, num: 1, spareName: this.spareRows[i].name, ggxh: this.spareRows[i].ggxh })
+          data.push({ remark: values.remark, isSpecial: this.isSpecial, sbId: this.model.sbId, repairId: this.model.id, num: 1, spareName: this.spareRows[i].spareName, ggxh: this.spareRows[i].ggxh })
         }
         addLongYanSparePartUsedBatch(data)
           .then((response) => {
@@ -120,9 +121,7 @@ export default {
     },
     handleSpareLongYanSelected (record, keys, rows) {
       this.spareRows = rows
-      for (let i = 0; i < rows.length; i++) {
-        this.spareName = this.spareName + ',' + rows[i].name
-      }
+      this.spareName = rows.length
     }
   }
 }

src/views/store/sparestore/modules/SpareLongYanSelectModal.vue

@@ -14,13 +14,18 @@
             <a-form layout="inline">
               <a-row :gutter="48">
                 <a-col :md="8" :sm="24">
-                  <a-form-item label="关键字">
-                    <a-input v-model.trim="queryParam.keyword" placeholder="请输入备件名称"/>
+                  <a-form-item label="备件名称">
+                    <a-input v-model.trim="queryParam.spareName" placeholder="请输入备件名称"/>
+                  </a-form-item>
+                </a-col>
+                <a-col :md="8" :sm="24">
+                  <a-form-item label="备件编码">
+                    <a-input v-model.trim="queryParam.spareNo" placeholder="请输入备件编码"/>
                   </a-form-item>
                 </a-col>
                 <a-col :md="8" :sm="24">
                   <a-form-item label="规格型号">
-                    <a-input v-model="queryParam.ggxh" placeholder="模糊查询"/>
+                    <a-input v-model="queryParam.ggxh" placeholder="请输入规格型号"/>
                   </a-form-item>
                 </a-col>
 <!--                <a-col :md="8" :sm="24">
@@ -147,6 +152,10 @@ export default {
           title: '备件名称',
           dataIndex: 'spareName'
         },
+        {
+          title: '备件编码',
+          dataIndex: 'no'
+        },
         {
           title: '规格型号',
           dataIndex: 'ggxh'