解决冲突

mes/qd/src/api/wms/st/out/semiProductOut.js

@@ -94,7 +94,6 @@ export function oneCancel(data) {
   })
 }
 export function setPoint(data) {
-
   return request({
     url: '/api/semiProductOut/setPoint',
     method: 'post',

mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue

@@ -139,7 +139,7 @@ export default {
         this.notify('保存成功', 'success')
       }).catch(() => {
       })
-    },
+    }
   }
 }
 </script>

mes/qd/src/views/wms/product_manage/workorder/index.vue

@@ -403,8 +403,7 @@
         <el-table-column prop="planproduceend_date" label="计划结束时间" width="100" show-overflow-tooltip />
         <el-table-column prop="realproducestart_date" label="实际开始时间" width="100" show-overflow-tooltip />
         <el-table-column prop="realproduceend_date" label="实际结束时间" width="100" show-overflow-tooltip />
-        <el-table-column prop="is_canupdate_update" label="允许修改报工数" :formatter="formatBoolean" width="200" show-overflow-tooltip>
+        <el-table-column prop="is_canupdate_update" label="允许修改报工数" :formatter="formatBoolean" width="200" show-overflow-tooltip />
-         </el-table-column>
         <el-table-column prop="is_needmove" label="是否搬运" :formatter="formatBoolean" />
         <el-table-column prop="shift_type_scode" label="班次类型">
           <template slot-scope="scope">
@@ -416,7 +415,7 @@
             {{ dict.label.WORKORDER_CREATE_TYPE[scope.row.create_type] }}
           </template>
         </el-table-column>
-        <el-table-column prop="is_error" :formatter="formatBoolean" label="是否异常"></el-table-column>
+        <el-table-column prop="is_error" :formatter="formatBoolean" label="是否异常" />
         <el-table-column prop="error_info" label="异常信息" show-overflow-tooltip />
         <el-table-column prop="remark" label="备注" />
         <el-table-column prop="nok_qty" label="报废总数" />

mes/qd/src/views/wms/product_manage/workorder/reportDialog.vue

@@ -42,8 +42,8 @@
             v-model="query.is_report"
             active-color="#409EFF"
             inactive-color="#F56C6C"
-            active-value='true'
+            active-value="true"
-            inactive-valu='false'
+            inactive-valu="false"
           />
         </el-form-item>
         <rrOperation :crud="crud" />
@@ -80,8 +80,7 @@
       <el-table-column prop="needproduct_qty" label="待生产数" />
       <el-table-column prop="report_qty" label="报工数量">
         <template slot-scope="scope">
-          <el-input v-model = scope.row.report_qty></el-input>
+          <el-input v-model="scope.row.report_qty/" /></template>
-        </template>
       </el-table-column>
       <!--      <el-table-column prop="nok_qty" label="报废数量" >-->
       <!--        <template slot-scope="scope">-->

mes/qd/src/views/wms/product_manage/workorder/reportDialog3.vue

@@ -42,8 +42,8 @@
                 v-model="query.is_report"
                 active-color="#409EFF"
                 inactive-color="#F56C6C"
-                active-value='true'
+                active-value="true"
-                inactive-valu='false'
+                inactive-valu="false"
               />
             </el-form-item>
             <el-dropdown split-button type="primary" class="filter-item" @click="report()">
@@ -76,18 +76,15 @@
         <el-table-column prop="needproduct_qty" label="待生产数" />
         <el-table-column prop="report_qty" label="报工数量">
           <template slot-scope="scope">
-            <el-input v-model = scope.row.report_qty></el-input>
+            <el-input v-model="scope.row.report_qty/" /></template>
-          </template>
         </el-table-column>
         <el-table-column prop="nok_qty" label="报废数量">
           <template slot-scope="scope">
-            <el-input v-model = scope.row.nok_qty></el-input>
+            <el-input v-model="scope.row.nok_qty/" /></template>
-          </template>
         </el-table-column>
         <el-table-column prop="repare_qty" label="报修数量">
           <template slot-scope="scope">
-            <el-input v-model = scope.row.repare_qty></el-input>
+            <el-input v-model="scope.row.repare_qty/" /></template>
-          </template>
         </el-table-column>
         <el-table-column prop="person_finish_qty" label="人员期末数量" />
         <el-table-column prop="operatetime_start" label="开工时间" />
@@ -154,7 +151,7 @@ const defaultForm = { sale_id: null,
   material_spec: null }
 
 export default {
-  name: 'reportDialog',
+  name: 'ReportDialog',
   components: { crudOperation, pagination, rrOperation },
   dicts: ['product_area'],
   cruds() {

mes/qd/src/views/wms/scheduler_manage/task/index.vue

@@ -157,7 +157,7 @@
         <el-table-column v-if="true" prop="material_id" label="物料标识" min-width="150" show-overflow-tooltip />
         <el-table-column v-if="true" prop="material_spec" label="物料标识" min-width="150" show-overflow-tooltip />
         <el-table-column prop="task_name" label="任务类型" min-width="120" show-overflow-tooltip />
-        <el-table-column prop = "acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip :formatter = "acsTypeName"></el-table-column>
+        <el-table-column prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip :formatter="acsTypeName" />
         <el-table-column v-if="false" prop="task_status" label="任务状态" />
         <el-table-column prop="task_status_name" label="任务状态" width="120px" :formatter="formatTaskStatusName" />
         <el-table-column prop="point_code1" label="起点" width="100" />