2025-05-19

BOM和Routing这边，添加一个跳转到Inventory part的链接描述没有改新物料编码改成IFS料号
8 months ago · aaaaf18b8f
5 changed files with 95 additions and 31 deletions
--- a/src/views/modules/changeManagement/changeRecord.vue
+++ b/src/views/modules/changeManagement/changeRecord.vue
@ -244,7 +244,7 @@
                    header-align="center"
                    align="center"
                    min-width="170"
-                    label="新物料编码">
+                    label="IFS料号">
                    <template slot-scope="scope">
                      <el-input :disabled="changeRequestDetailFlag('newPartNo') === 'N'" @input="(val)=>partInput(scope.row, val)" :ref="`newPartNo${scope.$index}`" v-model="scope.row.newPartNo" @keyup.enter.native="focusNextInput(scope.$index, 'newPartNo')" style="width:77%"></el-input>
                      <el-button :disabled="changeRequestDetailFlag('newPartNo') === 'N'" type="primary" @click="choosePartNo(scope.row)" style="width:18%;padding: 3px 7px">·&nbsp;·&nbsp;·</el-button>
@ -470,7 +470,7 @@
              <el-form-item label="原菲林编号">
                <el-input :disabled="changeExecutionInfoFlag('originalFilmNo') === 'N'" v-model="executionInfoData.originalFilmNo" style="width: 226px"></el-input>
              </el-form-item>
-              <el-form-item label="原啤刀编号">
+              <el-form-item label="原碑刀编号">
                <el-input :disabled="changeExecutionInfoFlag('originalDieCuttingRuleNo') === 'N'" v-model="executionInfoData.originalDieCuttingRuleNo" style="width: 226px"></el-input>
              </el-form-item>
              <el-form-item label="原网板/印版编号">
@ -484,7 +484,7 @@
              <el-form-item label="新菲林编号">
                <el-input :disabled="changeExecutionInfoFlag('newFilmNo') === 'N'" v-model="executionInfoData.newFilmNo" style="width: 226px"></el-input>
              </el-form-item>
-              <el-form-item label="新啤刀编号">
+              <el-form-item label="新碑刀编号">
                <el-input :disabled="changeExecutionInfoFlag('newDieCuttingRuleNo') === 'N'" v-model="executionInfoData.newDieCuttingRuleNo" style="width: 226px"></el-input>
              </el-form-item>
              <el-form-item label="新网板/印版编号">
@ -605,7 +605,7 @@
                  width="60"
                  label="操作">
                  <template slot-scope="scope">
-                    <el-link v-if="scope.row.executeFlag !== 'Y' && $store.state.user.name === scope.row.itemDesc && modalData.changeStatus === '审批中'" style="cursor: pointer" @click="executeCSModal(scope.row)">执行</el-link>
+                    <el-link v-if="scope.row.executeFlag !== 'Y' && $store.state.user.name === scope.row.itemDesc && modalData.changeStatus === '审批中'" style="cursor: pointer" @click="executeCSModal(scope.row)">会签</el-link>
                  </template>
                </el-table-column>
              </el-table>
@ -802,12 +802,12 @@
                    </el-form-item>
                  </el-col>
                  <el-col :span="12">
-                    <el-form-item label="原啤刀编号">
+                    <el-form-item label="原碑刀编号">
                      <el-input disabled v-model="currentExecutionInfoData.originalDieCuttingRuleNo" ></el-input>
                    </el-form-item>
                  </el-col>
                  <el-col :span="12">
-                    <el-form-item label="新啤刀编号">
+                    <el-form-item label="新碑刀编号">
                      <el-input disabled v-model="currentExecutionInfoData.newDieCuttingRuleNo" ></el-input>
                    </el-form-item>
                  </el-col>
@ -2051,8 +2051,8 @@
            tableName: '变更单基本信息表',
            columnProp: 'newPartNo',
            headerAlign: 'center',
-            align: 'center',
-            columnLabel: '新物料编码',
+            align: 'left',
+            columnLabel: 'IFS料号',
            columnHidden: false,
            columnImage: false,
            status: true,
@ -4002,7 +4002,6 @@
        //   return
        // }

-
        if (this.costImpactData.productionProductFlag === 'Y') { // 在生产品
          if (this.costImpactData.productionProductNumber == null || this.costImpactData.productionProductNumber === '') {
            this.$message.warning('请填写在生产品数量！')
@ -4080,13 +4079,12 @@
          }
        }

-
        if (this.executionInfoData.originalDieCuttingRuleNo == null || this.executionInfoData.originalDieCuttingRuleNo === '') {
-          this.$message.warning('请填写原啤刀编号!')
+          this.$message.warning('请填写原碑刀编号!')
          return;
        }
        if (this.executionInfoData.newDieCuttingRuleNo == null || this.executionInfoData.newDieCuttingRuleNo === '') {
-          this.$message.warning('请填写新啤刀编号!')
+          this.$message.warning('请填写新碑刀编号!')
          return;
        }
        if (this.executionInfoData.originalStencilNo == null || this.executionInfoData.originalStencilNo === '') {
@ -4354,7 +4352,7 @@

      // 执行所选属性
      executeCSModal (row) {
-        this.$confirm(`是否确认提交?`, '提示', {
+        this.$confirm(`是否确认会签?`, '提示', {
          confirmButtonText: '确定',
          cancelButtonText: '取消',
          type: 'warning'
@ -4485,11 +4483,11 @@
        this.executionInfoData.chooseItemList = this.chooseItemList
        this.executionInfoData.chooseItemList2 = this.chooseItemList2
        if (this.executionInfoData.originalDieCuttingRuleNo == null || this.executionInfoData.originalDieCuttingRuleNo === '') {
-          this.$message.warning('请填写原啤刀编号!')
+          this.$message.warning('请填写原碑刀编号!')
          return;
        }
        if (this.executionInfoData.newDieCuttingRuleNo == null || this.executionInfoData.newDieCuttingRuleNo === '') {
-          this.$message.warning('请填写新啤刀编号!')
+          this.$message.warning('请填写新碑刀编号!')
          return;
        }
        if (this.executionInfoData.originalStencilNo == null || this.executionInfoData.originalStencilNo === '') {
--- a/src/views/modules/changeManagement/changeRequest.vue
+++ b/src/views/modules/changeManagement/changeRequest.vue
@ -112,7 +112,7 @@
                <el-input v-model="modalData.applicantId" @blur="applicantBlur(103)" style="width: 120px"></el-input>
                <el-input v-model="modalData.applicantName" disabled style="width: 293px"></el-input>
              </el-form-item>
-              <el-form-item label="申请部门" >
+              <el-form-item label="申请部门">
                <el-input v-model="modalData.applicationDepartmentId" readonly style="width: 120px"></el-input>
                <el-input v-model="modalData.applicationDepartmentName" disabled style="width: 293px"></el-input>
              </el-form-item>
@ -249,7 +249,7 @@
                    header-align="center"
                    align="center"
                    min-width="170"
-                    label="新物料编码">
+                    label="IFS料号">
                    <template slot-scope="scope">
                      <el-input @input="(val)=>partInput(scope.row, val)" :ref="`newPartNo${scope.$index}`" v-model="scope.row.newPartNo" @keyup.enter.native="focusNextInput(scope.$index, 'newPartNo')" style="width:77%"></el-input>
                      <el-button type="primary" @click="choosePartNo(scope.row)" style="width:18%;padding: 3px 7px">·&nbsp;·&nbsp;·</el-button>
@ -453,7 +453,7 @@
              <el-form-item label="原菲林编号">
                <el-input v-model="executionInfoData.originalFilmNo" style="width: 226px"></el-input>
              </el-form-item>
-              <el-form-item label="原啤刀编号">
+              <el-form-item label="原碑刀编号">
                <el-input v-model="executionInfoData.originalDieCuttingRuleNo" style="width: 226px"></el-input>
              </el-form-item>
              <el-form-item label="原网板/印版编号">
@ -467,7 +467,7 @@
              <el-form-item label="新菲林编号">
                <el-input v-model="executionInfoData.newFilmNo" style="width: 226px"></el-input>
              </el-form-item>
-              <el-form-item label="新啤刀编号">
+              <el-form-item label="新碑刀编号">
                <el-input v-model="executionInfoData.newDieCuttingRuleNo" style="width: 226px"></el-input>
              </el-form-item>
              <el-form-item label="新网板/印版编号">
@ -2402,6 +2402,7 @@
            }
            this.chooseItemList = []
            this.chooseItemList2 = []
+            this.chooseCSItemList = []
            this.getDepartmentByUserName()
            this.getEcnTypeData() // 获取ECN种类
            this.chooseDataList = this.dataSelections
@ -2663,11 +2664,11 @@
          this.executionInfoData.chooseItemList2 = this.chooseItemList2
        }
        if (this.executionInfoData.originalDieCuttingRuleNo == null || this.executionInfoData.originalDieCuttingRuleNo === '') {
-          this.$message.warning('请填写原啤刀编号!')
+          this.$message.warning('请填写原碑刀编号!')
          return;
        }
        if (this.executionInfoData.newDieCuttingRuleNo == null || this.executionInfoData.newDieCuttingRuleNo === '') {
-          this.$message.warning('请填写新啤刀编号!')
+          this.$message.warning('请填写新碑刀编号!')
          return;
        }
        if (this.executionInfoData.originalStencilNo == null || this.executionInfoData.originalStencilNo === '') {
--- a/src/views/modules/part/bomManagement.vue
+++ b/src/views/modules/part/bomManagement.vue
@ -67,8 +67,14 @@
        :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 === 'ifsPartNo'">
+            <el-link style="cursor:pointer;" v-if="!item.columnHidden" @click="toPartMenu(scope.row.ifsPartNo)"> {{ scope.row[item.columnProp] }}</el-link>
+            <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"> {{ scope.row[item.columnProp] }}</span>
+            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+          </div>
        </template>
      </el-table-column>
      <el-table-column
@ -1214,7 +1220,7 @@ export default {
          tableName: 'BOM信息表',
          columnProp: 'plmPartNo',
          headerAlign: 'center',
-          align: 'center',
+          align: 'left',
          columnLabel: 'PLM物料编码',
          columnHidden: false,
          columnImage: false,
@ -1232,7 +1238,7 @@ export default {
          tableName: 'BOM信息表',
          columnProp: 'ifsPartNo',
          headerAlign: 'center',
-          align: 'center',
+          align: 'left',
          columnLabel: 'IFS物料编码',
          columnHidden: false,
          columnImage: false,
@ -4326,7 +4332,16 @@ export default {
      } else {
        this.$router.push({name:"part-routingManagement",params:{partNo: partNo}})
      }
-    }
+    },
+
+    // 切换到inventoryPart
+    toPartMenu (ifsPartNo) {
+      if (this.$router.resolve(`/part-partInformation`).resolved.name === '404') {
+        this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',})
+      } else {
+        this.$router.push({name:`part-partInformation`,params:{ifsPartNo: ifsPartNo},})
+      }
+    },
  }
 }
 </script>
--- a/src/views/modules/part/partInformation.vue
+++ b/src/views/modules/part/partInformation.vue
@ -3401,13 +3401,48 @@
    },

    created () {
+      this.searchData = {
+        site: this.$store.state.user.site,
+        partNo: '',
+        erpPartNo: '',
+        startDate: '',
+        endDate: '',
+        partDesc: '',
+        spec: '',
+        active: '',
+        page: 1,
+        limit: 10,
+        status: '',
+        ifsPartNo: '',
+        plmPartNo: '',
+        partType: ''
+      }
      this.getDataList()
    },

    activated() {
+      this.searchData = {
+        site: this.$store.state.user.site,
+        partNo: '',
+        erpPartNo: '',
+        startDate: '',
+        endDate: '',
+        partDesc: '',
+        spec: '',
+        active: '',
+        page: 1,
+        limit: 10,
+        status: '',
+        ifsPartNo: '',
+        plmPartNo: '',
+        partType: ''
+      }
      if (this.$route.params.partNo) {
        this.searchData.plmPartNo = this.$route.params.partNo
        this.getDataList2()
+      } else if (this.$route.params.ifsPartNo) {
+        this.searchData.ifsPartNo = this.$route.params.ifsPartNo
+        this.getDataList()
      }
    },

--- a/src/views/modules/part/routingManagement.vue
+++ b/src/views/modules/part/routingManagement.vue
@ -67,8 +67,14 @@
        :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 === 'ifsPartNo'">
+            <el-link style="cursor:pointer;" v-if="!item.columnHidden" @click="toPartMenu(scope.row.ifsPartNo)"> {{ scope.row[item.columnProp] }}</el-link>
+            <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"> {{ scope.row[item.columnProp] }}</span>
+            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+          </div>
        </template>
      </el-table-column>
      <el-table-column
@ -1349,7 +1355,7 @@ export default {
          tableName: 'Routing信息表',
          columnProp: 'plmPartNo',
          headerAlign: 'center',
-          align: 'center',
+          align: 'left',
          columnLabel: 'PLM物料编码',
          columnHidden: false,
          columnImage: false,
@ -1367,7 +1373,7 @@ export default {
          tableName: 'Routing信息表',
          columnProp: 'ifsPartNo',
          headerAlign: 'center',
-          align: 'center',
+          align: 'left',
          columnLabel: 'IFS物料编码',
          columnHidden: false,
          columnImage: false,
@ -4821,7 +4827,16 @@ export default {
      } else {
        this.$router.push({name:"part-bomManagement",params:{partNo: partNo}})
      }
-    }
+    },
+
+    // 切换到inventoryPart
+    toPartMenu (ifsPartNo) {
+      if (this.$router.resolve(`/part-partInformation`).resolved.name === '404') {
+        this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',})
+      } else {
+        this.$router.push({name:`part-partInformation`,params:{ifsPartNo: ifsPartNo},})
+      }
+    },
  }
 }
 </script>