Merge remote-tracking branch 'origin/master'

src/views/modules/part/bomManagement.vue

@@ -141,8 +141,8 @@
           <el-input v-model="modalData.engRevision" style="width: 221px"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="modalData.flag === '1'" :loading="saveHeaderLoading" type="primary" @click="saveBomHeader" style="margin-top: 23px;width: 120px">保存</el-button>
-          <el-button v-else type="primary" @click="copyBomRevision" style="margin-top: 23px;width: 120px">Copy</el-button>
+          <el-button v-if="modalData.flag === '1' && headerSaveFlag" :loading="saveHeaderLoading" type="primary" @click="saveBomHeader" style="margin-top: 23px;width: 120px">保存</el-button>
+          <el-button v-else-if="modalData.flag === '2'" type="primary" @click="copyBomRevision" style="margin-top: 23px;width: 120px">Copy</el-button>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
@@ -419,11 +419,24 @@
     </el-dialog>
 
     <!-- 工序 -->
-    <el-dialog title="工序清单" :close-on-click-modal="false" v-drag :visible.sync="operationModelFlag" width="400px">
+    <el-dialog title="工序清单" :close-on-click-modal="false" v-drag :visible.sync="operationModelFlag" width="700px">
       <div class="rq">
         <el-form :inline="true" label-position="top" :model="operationData">
-          <el-form-item :label="'模板名称'">
-            <el-input v-model="operationData.operationName" clearable style="width: 120px"></el-input>
+          <el-form-item label="Routing版本号">
+            <el-input v-model="operationData.routingRevision" clearable style="width: 120px"></el-input>
+          </el-form-item>
+          <el-form-item label="工艺类型">
+            <el-select v-model="operationData.routingType" clearable style="width: 120px">
+              <el-option label="Manufacturing" value="Manufacturing"></el-option>
+              <el-option label="Repair" value="Repair"></el-option>
+              <el-option label="Prototype" value="Prototype"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="替代编码">
+            <el-input v-model="operationData.alternativeNo" clearable style="width: 120px"></el-input>
+          </el-form-item>
+          <el-form-item label="工序编码">
+            <el-input v-model="operationData.operationNo" clearable style="width: 120px"></el-input>
           </el-form-item>
           <el-form-item :label="' '">
             <el-button type="primary" @click="queryOperationList()">查询</el-button>
@@ -826,6 +839,10 @@ export default {
       operationData: {
         site: this.$store.state.user.site,
         partNo: '',
+        routingRevision: '',
+        routingType: '',
+        alternativeNo: '',
+        operationNo: '',
         operationName: '',
       },
       copyBomData: {
@@ -1389,6 +1406,61 @@ export default {
         },
       ],
       operationDetailList: [
+        {
+          columnProp: 'routingRevision',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: 'Routing版本号',
+          columnHidden: false,
+          columnImage: false,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+        {
+          columnProp: 'routingType',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '工艺类型',
+          columnHidden: false,
+          columnImage: false,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+        {
+          columnProp: 'alternativeNo',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '替代编码',
+          columnHidden: false,
+          columnImage: false,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          columnProp: 'alternativeDescription',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '替代名称',
+          columnHidden: false,
+          columnImage: false,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+        {
+          columnProp: 'status',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '替代状态',
+          columnHidden: false,
+          columnImage: false,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
         {
           columnProp: 'operationNo',
           headerAlign: "center",
@@ -1396,10 +1468,9 @@ export default {
           columnLabel: '工序编码',
           columnHidden: false,
           columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
           status: true,
           fixed: '',
+          columnWidth: 80
         },
         {
           columnProp: 'operationName',
@@ -1408,10 +1479,9 @@ export default {
           columnLabel: '工序名称',
           columnHidden: false,
           columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
           status: true,
           fixed: '',
+          columnWidth: 100
         }
       ],
       columnBomDetailList: [
@@ -1577,7 +1647,8 @@ export default {
       componentDisableFlag: false,
       operationModelFlag: false,
       copyBomModelFlag: false,
-      copyAlternativeModelFlag: false
+      copyAlternativeModelFlag: false,
+      headerSaveFlag: false
     }
   },
 
@@ -1732,6 +1803,7 @@ export default {
       }
       this.detailDataList = []
       this.subDetailList = []
+      this.headerSaveFlag = true
       this.modalDisableFlag = false
       this.modalFlag = true
     },
@@ -2237,6 +2309,7 @@ export default {
      */
     getRowOperationData (row) {
       this.componentData.operationId = row.operationId
+      this.componentData.operationName = row.operationName
       this.operationModelFlag = false
     },
 
@@ -2508,6 +2581,7 @@ export default {
           this.detailData = data.rows.detailData
           this.subDetailList = []
           this.modalDisableFlag = true
+          this.headerSaveFlag = false
           this.$message({
             message: '操作成功',
             type: 'success',
@@ -2914,6 +2988,15 @@ export default {
       queryOperationList(this.operationData).then(({data}) => {
         if (data && data.code === 0) {
           this.operationList = data.rows
+          this.operationData = {
+            site: this.$store.state.user.site,
+            partNo: this.modalData.partNo,
+            routingRevision: '',
+            routingType: '',
+            alternativeNo: '',
+            operationNo: '',
+            operationName: '',
+          }
           this.operationModelFlag = true
         } else {
           this.$alert(data.msg, '错误', {

src/views/modules/part/routingManagement.vue

@@ -132,8 +132,8 @@
           <el-input v-model="modalData.routingRevision" type="number" disabled style="width: 221px"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="modalData.flag === '1'" :loading="saveHeaderLoading" type="primary" @click="saveRoutingHeader" style="margin-top: 23px;width: 142px">保存</el-button>
-          <el-button v-else type="primary" @click="copyRoutingRevision" style="margin-top: 23px;width: 120px">Copy</el-button>
+          <el-button v-if="modalData.flag === '1' && headerSaveFlag" :loading="saveHeaderLoading" type="primary" @click="saveRoutingHeader" style="margin-top: 23px;width: 142px">保存</el-button>
+          <el-button v-else-if="modalData.flag === '2'" type="primary" @click="copyRoutingRevision" style="margin-top: 23px;width: 120px">Copy</el-button>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
@@ -303,7 +303,7 @@
     </el-dialog>
 
     <!-- 物料模态框 -->
-    <el-dialog title="物料清单" :close-on-click-modal="false" v-drag :visible.sync="partModelFlag" width="520px">
+    <el-dialog title="物料清单" :close-on-click-modal="false" v-drag :visible.sync="partModelFlag" width="900px">
       <div class="rq">
         <el-form :inline="true" label-position="top" :model="partData">
           <el-form-item :label="'物料编码'">
@@ -2256,7 +2256,8 @@ export default {
       copyAlternativeModelFlag: false,
       queryWorkGuidelineModal: false,
       saveWorkGuidelineModal: false,
-      workGuidelineDisableModal: false
+      workGuidelineDisableModal: false,
+      headerSaveFlag: false
     }
   },
 
@@ -2427,6 +2428,7 @@ export default {
       }
       this.detailDataList = []
       this.subDetailList = []
+      this.headerSaveFlag = true
       this.modalDisableFlag = false
       this.modalFlag = true
     },
@@ -3226,6 +3228,7 @@ export default {
           this.detailDataList = data.rows.detailDataList
           this.detailData = data.rows.detailData
           this.subDetailList = []
+          this.headerSaveFlag = false
           this.modalDisableFlag = true
           this.$message({
             message: '操作成功',

src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue

@@ -549,7 +549,7 @@
             columnProp: 'efficiencyFactor',
             headerAlign: 'center',
             align: 'right',
-            columnLabel: '机器效率',
+            columnLabel: '效率',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -585,7 +585,7 @@
             columnProp: 'machSetupTime',
             headerAlign: 'center',
             align: 'right',
-            columnLabel: '调机时长',
+            columnLabel: '机器调机时长',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -621,7 +621,7 @@
             columnProp: 'laborRunFactor',
             headerAlign: 'center',
             align: 'right',
-            columnLabel: '人工效率',
+            columnLabel: '人工生产速度',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -639,7 +639,7 @@
             columnProp: 'laborSetupTime',
             headerAlign: 'center',
             align: 'right',
-            columnLabel: '人工生产速度',
+            columnLabel: '人工调机时长',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -657,7 +657,7 @@
             columnProp: 'crewSize',
             headerAlign: 'center',
             align: 'right',
-            columnLabel: '生产过程人数',
+            columnLabel: '生产过程中人数',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -675,7 +675,7 @@
             columnProp: 'setupCrewSize',
             headerAlign: 'center',
             align: 'right',
-            columnLabel: '调机过程人数',
+            columnLabel: '调机过程中人数',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,

src/views/modules/tooling/toolingInfo.vue

@@ -282,7 +282,7 @@
           <el-table-column label="工具数量" width="60" prop="toolQuantity" show-overflow-tooltip/>
           <el-table-column label="申请数量" width="70" prop="applyQty" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input v-model="scope.row.applyQty" type="number" @change="changeSum"  placeholder="请输入数量" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')"
+              <el-input v-model="scope.row.applyQty" type="number" @change="changeSum(scope.row)"  placeholder="请输入数量" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')"
                         style="width:98%"></el-input>
             </template>
           </el-table-column>
@@ -698,7 +698,14 @@
         };
         this.visible=true;
       },
-      changeSum(){
+      changeSum(row){
+        if(row.applyQty!=null&&row.applyQty!==''&& row.toolQuantity<row.applyQty){
+          row.applyQty=''
+          this.$alert('实际申请数量大于表单工具数量！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
         this.dataForm.applySumQty =0
         for (const item of this.toolData) {
           // 累加之前先确保值存在，并将 null 或 undefined 转换为0
@@ -706,6 +713,14 @@
         }
       },
       saveData(){
+        for (let i = 0; i <  this.toolData.length; i++) {
+          if(this.toolData[i].toolQuantity<this.toolData[i].applyQty){
+            this.$alert( '工具：'+this.toolData[i].toolNo +'  实际申请数量大于表单工具数量！', '错误', {
+              confirmButtonText: '确定'
+            })
+            return false;
+          }
+        }
         if(this.dataForm.applySumQty===0){
           this.$alert('未填写申请数量！', '错误', {
             confirmButtonText: '确定'