解决冲突

mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/ViewDialog.vue

@@ -15,11 +15,11 @@
       </el-form-item>
       <el-form-item label="所属仓库" prop="stor_name">
         <label slot="label">所属仓库:</label>
-        <el-input v-model="form.stor_name" disabled  clearable style="width: 210px" />
+        <el-input v-model="form.stor_name" disabled clearable style="width: 210px" />
       </el-form-item>
       <el-form-item label="入库点" prop="point_code">
         <label slot="label">入库点:</label>
-        <el-input v-model="form.point_code" disabled  clearable style="width: 210px" />
+        <el-input v-model="form.point_code" disabled clearable style="width: 210px" />
       </el-form-item>
       <el-form-item label="生产车间">
         <el-select

mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/index.vue

@@ -147,7 +147,7 @@
           type="warning"
           icon="el-icon-check"
           size="mini"
-          :disabled= dis_flag
+          :disabled="dis_flag"
           @click="confirm"
         >
           强制确认
@@ -220,7 +220,7 @@ import ViewDialog from '@/views/wms/storage_manage/semiproduct/semiproductIn/Vie
 import { mapGetters } from 'vuex'
 
 export default {
-  name: 'semiproductIn',
+  name: 'SemiproductIn',
   components: { ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination },
   cruds() {
     return CRUD({
@@ -292,7 +292,7 @@ export default {
     buttonChange(currentRow) {
       if (currentRow !== null) {
         this.currentRow = currentRow
-        if (currentRow.bill_status === '10' || currentRow.bill_status === '20' ) {
+        if (currentRow.bill_status === '10' || currentRow.bill_status === '20') {
           this.confirm_flag = false
         } else {
           this.confirm_flag = true