2024.9.24 一、物料成本信息维护（第二版修正）

二、加工中心功能改造
三、标准工序（第三版修正）
四、商品组 - 标准工序（第三版修正）
五、商品组 - Process Time Matrix（第二版修正）

src/views/modules/part/partProductGroupInformation.vue

@@ -67,8 +67,16 @@
         :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
-          <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
-          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+          <div v-if="item.columnProp !== 'active'">
+            <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+          </div>
+          <div v-else>
+            <span v-if="!item.columnHidden">
+              <span v-if="scope.row.active === 'Y'">是</span>
+              <span v-if="scope.row.active === 'N'">否</span>
+            </span>
+          </div>
         </template>
       </el-table-column>
       <el-table-column
@@ -100,7 +108,7 @@
     <el-dialog :title="modalData.title" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="495px">
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="BU" prop="bu" :rules="rules.bu">
-          <el-select v-model="modalData.bu" placeholder="请选择" :disabled="modalDisableFlag" style="width: 107px">
+          <el-select v-model="modalData.bu" placeholder="请选择" :disabled="modalDisableFlag" style="width: 140px">
             <el-option
               v-for = "i in userBuList"
               :key = "i.buNo"
@@ -110,7 +118,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="是否在用" prop="active" :rules="rules.active">
-          <el-select v-model="modalData.active" style="width: 103px">
+          <el-select v-model="modalData.active" style="width: 70px">
             <el-option label="是" value="Y"></el-option>
             <el-option label="否" value="N"></el-option>
           </el-select>
@@ -122,12 +130,12 @@
             <el-option label="商品组3" value="3"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="Yield Rate" prop="yieldRate">
+        <el-form-item label="Yield Rate(%)" prop="yieldRate">
           <el-input
             v-model="modalData.yieldRate"
             :disabled="this.modalData.type !== '2'"
             style="width: 103px"
-            placeholder="0.0000"
+            placeholder="0.00"
             class="inlineNumber numInput"
           ></el-input>
         </el-form-item>
@@ -137,7 +145,7 @@
           <el-input v-model="modalData.productGroupId" :disabled="modalDisableFlag" style="width: 140px"></el-input>
         </el-form-item>
         <el-form-item label="商品组名称" prop="productGroupName" :rules="rules.productGroupName">
-          <el-input v-model="modalData.productGroupName" style="width: 302px"></el-input>
+          <el-input v-model="modalData.productGroupName" style="width: 304px"></el-input>
         </el-form-item>
       </el-form>
       <el-footer style="height:30px;margin-top: 20px;text-align:center">
@@ -564,6 +572,24 @@ export default {
       copyProcessAttributeList: [],
       // 展示列集
       columnList: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 601006,
+          serialNumber: '601006Table1BuDesc',
+          tableId: "601006Table1",
+          tableName: "商品组信息表",
+          columnProp: 'buDesc',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: 'BU',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 601006,
@@ -643,14 +669,14 @@ export default {
           columnProp: 'yieldRate',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: 'Yield Rate',
+          columnLabel: 'Yield Rate(%)',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 80
+          columnWidth: 90
         },
         {
           userId: this.$store.state.user.name,
@@ -743,7 +769,7 @@ export default {
           status: true,
           fixed: '',
           columnWidth: 70,
-          isVisible: true // 控制显示的属性
+          isVisible: false // 控制显示的属性
         },
         {
           userId: this.$store.state.user.name,
@@ -1466,8 +1492,8 @@ export default {
         if (val === 219) {
           strVal = this.ptmModalData.itemNo
         }
-        if (this.productGroupConditionCurrentRow.bu !== null && this.productGroupConditionCurrentRow.bu !== '' && this.productGroupConditionCurrentRow.bu !== undefined) {
-          conSql = " and site = '" + this.productGroupConditionCurrentRow.bu.split('_')[0] + "'" + " and bu_no = '" + this.productGroupConditionCurrentRow.bu.split('_')[1] + "'"
+        if (this.ptmModalData.bu !== null && this.ptmModalData.bu !== '' && this.ptmModalData.bu !== undefined) {
+          conSql = " and site = '" + this.ptmModalData.bu.split('_')[0] + "'" + " and bu_no = '" + this.ptmModalData.bu.split('_')[1] + "'"
           this.$refs.baseList.init(val, strVal, conSql)
         } else {
           this.$refs.baseList.init(val, strVal)
@@ -1583,12 +1609,20 @@ export default {
         this.$message.warning('请选择商品组！')
         return
       }
-      // 如果yieldRate<0或者大于10，提示时间为2000ms
-      if (!(this.modalData.yieldRate >= 0 && this.modalData.yieldRate < 10)) {
-        this.$alert('Yield Rate必须为0-10的正数！', '错误', {
-          confirmButtonText: '确定'
-        })
-        return
+      // yieldRate 0 – 100（包含100），而且需要支持小数，保留2位小数
+      if (this.modalData.type === '2') {
+        if (this.modalData.yieldRate === '' || this.modalData.yieldRate == null) {
+          this.$message.warning('请填写Yield Rate！')
+          return
+        }
+        if (this.modalData.yieldRate <= 0 || this.modalData.yieldRate >= 100) {
+          this.$message.warning('Yield Rate范围为0-100！')
+          return
+        }
+        if (!/^\d+(\.\d{1,2})?$/.test(this.modalData.yieldRate)) {
+          this.$message.warning('Yield Rate最多保留两位小数！')
+          return
+        }
       }
       if (this.modalData.flag === '1') {
         productGroupInformationSave(this.modalData).then(({data}) => {
@@ -1836,10 +1870,14 @@ export default {
       } else {
         this.ptmModalData.seqNo = 1
       }
+      this.ptmModalData.buNo = this.productGroupCurrentRow.buNo
+      this.ptmModalData.site = this.productGroupCurrentRow.site
+      this.ptmModalData.bu = this.ptmModalData.site + '_' + this.ptmModalData.buNo
       this.ptmSaveFlag = true
     },
 
     async saveProductGroupPtm () {
+      console.log(this.ptmModalData)
       // 确保 modelBlur 完成
       await this.modelBlur(219);
       if (this.ptmModalData.conditionDesc === '' || this.ptmModalData.conditionDesc == null) {
@@ -2029,8 +2067,8 @@ export default {
         let tempData = {
           tagno: tagNo,
           conditionSql: " and code_no = '" + this.ptmModalData.itemNo + "'" +
-            " and site  = '" + this.productGroupConditionCurrentRow.bu.split('_')[0] + "'" +
-            " and bu_no  = '" + this.productGroupConditionCurrentRow.bu.split('_')[1] + "'"
+            " and site  = '" + this.ptmModalData.bu.split('_')[0] + "'" +
+            " and bu_no  = '" + this.ptmModalData.bu.split('_')[1] + "'"
         };
 
         // 返回 Promise

src/views/modules/part/standardRoutingOperation.vue

@@ -110,23 +110,31 @@
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item prop="laborClassNo" :rules="rules.laborClassNo">
-          <span style="cursor: pointer" slot="label" @click="getBaseList(217, 1)"><a herf="#">人员等级编码</a></span>
-          <el-input v-model="modalData.laborClassNo" @blur="laborClassBlur(217)" style="width: 140px"></el-input>
+        <el-form-item :label="'调机过程中人数'" prop="setupCrewSize" :rules="rules.setupCrewSize">
+          <el-input-number :controls="false" :step="0" v-model="modalData.setupCrewSize" @change="changeSetupCrewSize()" style="width: 140px"></el-input-number>
         </el-form-item>
-        <el-form-item :label="'人员等级描述'" prop="laborClassDesc" :rules="rules.laborClassDesc">
-          <el-input v-model="modalData.laborClassDesc" disabled style="width: 302px"></el-input>
+        <el-form-item :label="'生产过程中人数'" prop="crewSize" :rules="rules.crewSize">
+          <el-input-number :controls="false" :step="0" v-model="modalData.crewSize" style="width: 302px"></el-input-number>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item prop="setupLaborClassNo" :rules="rules.setupLaborClassNo">
-          <span style="cursor: pointer" slot="label" @click="getBaseList(217, 2)"><a herf="#">调机时人员等级编码</a></span>
-          <el-input v-model="modalData.setupLaborClassNo" @blur="setupLaborClassBlur(217)" style="width: 140px"></el-input>
+          <span style="cursor: pointer" slot="label" @click="getBaseList(217, 2)"><a herf="#">调机过程中人员等级编码</a></span>
+          <el-input v-model="modalData.setupLaborClassNo" @blur="setupLaborClassBlur(217)" @change="changeSetupLaborClassNo()" style="width: 140px"></el-input>
         </el-form-item>
-        <el-form-item :label="'调机时人员等级描述'" prop="setupLaborClassDesc" :rules="rules.setupLaborClassDesc">
+        <el-form-item :label="'调机过程中人员等级描述'" prop="setupLaborClassDesc" :rules="rules.setupLaborClassDesc">
           <el-input v-model="modalData.setupLaborClassDesc" disabled style="width: 302px"></el-input>
         </el-form-item>
       </el-form>
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item prop="laborClassNo" :rules="rules.laborClassNo">
+          <span style="cursor: pointer" slot="label" @click="getBaseList(217, 1)"><a herf="#">人员等级编码</a></span>
+          <el-input v-model="modalData.laborClassNo" @blur="laborClassBlur(217)" style="width: 140px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'人员等级描述'" prop="laborClassDesc" :rules="rules.laborClassDesc">
+          <el-input v-model="modalData.laborClassDesc" disabled style="width: 302px"></el-input>
+        </el-form-item>
+      </el-form>
       <el-footer style="height:30px;margin-top: 20px;text-align:center">
         <el-button type="primary" @click="saveData">保存</el-button>
         <el-button type="primary" @click="modalFlag = false">关闭</el-button>
@@ -207,6 +215,8 @@ export default {
         laborClassDesc: '',
         setupLaborClassNo: '',
         setupLaborClassDesc: '',
+        setupCrewSize: '',
+        crewSize: '',
       },
       // ======== 数据列表 ========
       dataList: [],
@@ -267,7 +277,43 @@ export default {
           columnWidth: 300
         },
         {
-          functionId: 6010012,
+          userId: this.$store.state.user.name,
+          functionId: 601003,
+          serialNumber: '6010012Table2CrewSize',
+          tableId: '6010012Table2',
+          tableName: '标准工序表',
+          columnProp: 'crewSize',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '生产过程人数',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 601003,
+          serialNumber: '6010012Table2SetupCrewSize',
+          tableId: '6010012Table2',
+          tableName: '标准工序表',
+          columnProp: 'setupCrewSize',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '调机过程人数',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+        {
+          functionId: 601003,
           serialNumber: '6010012Table1WorkCenterNo',
           tableId: '6010012Table1',
           tableName: '标准工序表',
@@ -345,7 +391,7 @@ export default {
           columnProp: 'setupLaborClassNo',
           headerAlign: "center",
           align: "center",
-          columnLabel: '调机时人员等级编码',
+          columnLabel: '调机过程中人员等级编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -363,7 +409,7 @@ export default {
           columnProp: 'setupLaborClassDesc',
           headerAlign: "center",
           align: "center",
-          columnLabel: '调机时人员等级描述',
+          columnLabel: '调机过程中人员等级描述',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -509,6 +555,20 @@ export default {
             trigger: ['blur','change']
           }
         ],
+        setupCrewSize: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur','change']
+          }
+        ],
+        crewSize: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur','change']
+          }
+        ],
       },
       // ======== 模态框开关控制 ========
       authSearch: false,
@@ -678,6 +738,8 @@ export default {
         laborClassDesc: '',
         setupLaborClassNo: '',
         setupLaborClassDesc: '',
+        setupCrewSize: 1,
+        crewSize: 1,
         createBy: this.$store.state.user.name,
       }
       this.modalDisableFlag = false
@@ -705,12 +767,23 @@ export default {
         laborClassDesc: row.laborClassDesc,
         setupLaborClassNo: row.setupLaborClassNo,
         setupLaborClassDesc: row.setupLaborClassDesc,
+        setupCrewSize: row.setupCrewSize,
+        crewSize: row.crewSize,
         updateBy: this.$store.state.user.name,
       }
       this.modalDisableFlag = true
       this.modalFlag = true
     },
 
+    changeSetupLaborClassNo () {
+      this.modalData.laborClassNo = this.modalData.setupLaborClassNo
+      this.laborClassBlur(217)
+    },
+
+    changeSetupCrewSize () {
+      this.modalData.crewSize = this.modalData.setupCrewSize
+    },
+
     // ======== 新增/编辑/删除方法 ========
     /**
      * 分类信息新增/编辑
@@ -752,15 +825,23 @@ export default {
         return
       }
       if (this.modalData.setupLaborClassNo === '' || this.modalData.setupLaborClassNo == null) {
-        this.$message.warning('请填写调机时人员等级编码！')
+        this.$message.warning('请填写调机过程中人员等级编码！')
         return
       }
       if (this.modalData.setupLaborClassDesc === '' || this.modalData.setupLaborClassDesc == null) {
-        this.$alert('当前BU下调机时人员等级编码不存在,请重新输入调机时人员等级编码！', '提示', {
+        this.$alert('当前BU下调机过程中人员等级编码不存在,请重新输入调机过程中人员等级编码！', '提示', {
           confirmButtonText: '确定'
         })
         return
       }
+      if (this.modalData.setupCrewSize === '' || this.modalData.setupCrewSize == null) {
+        this.$message.warning('请填写调机过程中人数！')
+        return
+      }
+      if (this.modalData.crewSize === '' || this.modalData.crewSize == null) {
+        this.$message.warning('请填写生产过程中人数！')
+        return
+      }
       if (this.modalData.flag === '1') {
         saveStandardRoutingOperation(this.modalData).then(({data}) => {
           if (data && data.code === 0) {