2024-03-26 更新

2 years ago · 70904d0e36
8 changed files with 927 additions and 107 deletions
--- a/src/api/part/bomManagement.js
+++ b/src/api/part/bomManagement.js
@ -154,6 +154,39 @@ export const copyAlternative = data => createAPI(`/plm/bomManagement/copyAlterna
 */
 export const toBecomeOfficialBom = data => createAPI(`/plm/bomManagement/toBecomeOfficialBom`,'post',data)

+/**
+ * 新编辑副产品成本分配
+ * @param data
+ * @returns {*}
+ */
+export const updateManufStructCostDistrib = data => createAPI(`/plm/bomManagement/updateManufStructCostDistrib`,'post',data)
+
+/**
+ * 刷新子物料
+ * @param data
+ * @returns {*}
+ */
+export const queryBomComponentTable = data => createAPI(`/plm/bomManagement/queryBomComponentTable`,'post',data)

+/**
+ * 刷新副产品
+ * @param data
+ * @returns {*}
+ */
+export const queryBomByProductTable = data => createAPI(`/plm/bomManagement/queryBomByProductTable`,'post',data)
+
+/**
+ * 刷新项目成本分配
+ * @param data
+ * @returns {*}
+ */
+export const queryManufStructCostDistribtionTable = data => createAPI(`/plm/bomManagement/queryManufStructCostDistribtionTable`,'post',data)
+
+/**
+ * 刷新多级别结构
+ * @param data
+ * @returns {*}
+ */
+export const queryMultiLevelStructureTable = data => createAPI(`/plm/bomManagement/queryMultiLevelStructureTable`,'post',data)


--- a/src/views/modules/changeManagement/changeRecord.vue
+++ b/src/views/modules/changeManagement/changeRecord.vue
@ -30,6 +30,7 @@
      :height="height"
      :data="dataList"
      border
+      :row-style="rowStyle"
      ref="changeTable"
      @row-click="changeClickRow"
      @current-change="currentChange"
@ -191,10 +192,11 @@
                    prop=""
                    header-align="center"
                    align="center"
-                    min-width="90"
+                    min-width="170"
                    label="新物料编码">
                    <template slot-scope="scope">
-                      <el-input :ref="`newPartNo${scope.$index}`" v-model="scope.row.newPartNo" @keyup.enter.native="focusNextInput(scope.$index, 'newPartNo')" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
+                      <el-button type="primary" @click="choosePartNo(scope.row)" style="width:18%;padding: 3px 7px">·&nbsp;·&nbsp;·</el-button>
+                      <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>
                    </template>
                  </el-table-column>
                  <el-table-column
@ -204,7 +206,7 @@
                    min-width="90"
                    label="新图纸编码">
                    <template slot-scope="scope">
-                      <el-input :ref="`newDrawingNo${scope.$index}`" v-model="scope.row.newDrawingNo" @keyup.enter.native="focusNextInput(scope.$index, 'newDrawingNo')" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
+                      <el-input :ref="`newDrawingNo${scope.$index}`" v-model="scope.row.newDrawingNo" @keyup.enter.native="focusNextInput(scope.$index, 'newDrawingNo')" style="width:98%"></el-input>
                    </template>
                  </el-table-column>
                  <el-table-column
@ -214,7 +216,7 @@
                    min-width="90"
                    label="新图稿编码">
                    <template slot-scope="scope">
-                      <el-input :ref="`newDraftNo${scope.$index}`" v-model="scope.row.newDraftNo" @keyup.enter.native="focusNextInput(scope.$index, 'newDraftNo')" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
+                      <el-input :ref="`newDraftNo${scope.$index}`" v-model="scope.row.newDraftNo" @keyup.enter.native="focusNextInput(scope.$index, 'newDraftNo')" style="width:98%"></el-input>
                    </template>
                  </el-table-column>
                  <el-table-column
@ -752,6 +754,7 @@
        // 初始页签
        activeTable: 'basicInformation',
        activeName: 'basicInformation',
+        tempPartRow: {},
        // ======== 数据对象 ========
        modalData: {
          site: this.$store.state.user.site,
@ -887,7 +890,7 @@
            serialNumber: '108002Table1DepartmentName',
            tableId: '108002Table1',
            tableName: '工程变更记录表',
-            columnProp: 'departmentName',
+            columnProp: 'applicationDepartmentName',
            headerAlign: 'center',
            align: 'center',
            columnLabel: '申请部门',
@ -1469,6 +1472,15 @@

    methods: {

+      partInput (row, val) {
+        row.newPartNo = val.toUpperCase()
+      },
+
+      choosePartNo (row) {
+        this.tempPartRow = row
+        this.getBaseList(133)
+      },
+
      ecnTypeHeaderChange (val,index) {
        if (val === 'Y') {
          for (let i = 0; i < this.form[index].list.length; i++) {
@ -2238,6 +2250,9 @@
              }
            }
          }
+          if (val === 133) {
+            strVal = this.tempPartRow.newPartNo
+          }
          this.$refs.baseList.init(val, strVal)
        })
      },
@ -2266,6 +2281,9 @@
            //this.$set(this.costImpactData,'affectedExecutorName',val.user_display)
          }
        }
+        if (this.tagNo === 133) {
+          this.tempPartRow.newPartNo = val.part_no
+        }
      },

      // ======== 导出相关方法 ========
@ -2298,6 +2316,12 @@
        let s = eval('(' + json + ')')
        return s
      },
+
+      rowStyle ({row}) {
+        if (this.currentRow.changeNo === row.changeNo) {
+          return { 'background-color': '#E8F7F6', cursor: 'pointer' };
+        }
+      },
    }
  }
 </script>
--- a/src/views/modules/changeManagement/changeRequest.vue
+++ b/src/views/modules/changeManagement/changeRequest.vue
@ -3,11 +3,23 @@

    <!-- 查询条件 -->
    <el-form :inline="true" label-position="top" :model="searchData">
+      <el-form-item label="物料编码">
+        <el-input v-model="searchData.partNo" clearable style="width: 120px"/>
+      </el-form-item>
+      <el-form-item label="物料名称">
+        <el-input v-model="searchData.partDesc" clearable style="width: 150px"/>
+      </el-form-item>
+      <el-form-item label="客户编码">
+        <el-input v-model="searchData.customerId" clearable style="width: 120px"/>
+      </el-form-item>
+      <el-form-item label="客户名称">
+        <el-input v-model="searchData.customerDesc" clearable style="width: 150px"/>
+      </el-form-item>
      <el-form-item label="项目编码">
        <el-input v-model="searchData.projectId" clearable style="width: 120px"/>
      </el-form-item>
      <el-form-item label="项目名称">
-        <el-input v-model="searchData.projectDesc" clearable style="width: 200px"/>
+        <el-input v-model="searchData.projectDesc" clearable style="width: 150px"/>
      </el-form-item>
      <el-form-item label="技术参数卡编码">
        <el-input v-model="searchData.codeNo" clearable style="width: 120px"/>
@ -197,10 +209,11 @@
                    prop=""
                    header-align="center"
                    align="center"
-                    min-width="90"
+                    min-width="170"
                    label="新物料编码">
                    <template slot-scope="scope">
-                      <el-input :ref="`newPartNo${scope.$index}`" v-model="scope.row.newPartNo" @keyup.enter.native="focusNextInput(scope.$index, 'newPartNo')" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
+                      <el-button type="primary" @click="choosePartNo(scope.row)" style="width:18%;padding: 3px 7px">·&nbsp;·&nbsp;·</el-button>
+                      <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>
                    </template>
                  </el-table-column>
                  <el-table-column
@ -210,7 +223,7 @@
                    min-width="90"
                    label="新图纸编码">
                    <template slot-scope="scope">
-                      <el-input :ref="`newDrawingNo${scope.$index}`" v-model="scope.row.newDrawingNo" @keyup.enter.native="focusNextInput(scope.$index, 'newDrawingNo')" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
+                      <el-input :ref="`newDrawingNo${scope.$index}`" v-model="scope.row.newDrawingNo" @keyup.enter.native="focusNextInput(scope.$index, 'newDrawingNo')" style="width:98%"></el-input>
                    </template>
                  </el-table-column>
                  <el-table-column
@ -220,7 +233,7 @@
                    min-width="90"
                    label="新图稿编码">
                    <template slot-scope="scope">
-                      <el-input :ref="`newDraftNo${scope.$index}`" v-model="scope.row.newDraftNo" @keyup.enter.native="focusNextInput(scope.$index, 'newDraftNo')" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
+                      <el-input :ref="`newDraftNo${scope.$index}`" v-model="scope.row.newDraftNo" @keyup.enter.native="focusNextInput(scope.$index, 'newDraftNo')" style="width:98%"></el-input>
                    </template>
                  </el-table-column>
                  <el-table-column
@ -654,9 +667,14 @@
        pageSize: 50,
        totalPage: 0,
        activeName: 'basicInformation',
+        tempPartRow: {},
        // 条件查询
        searchData: {
          site: this.$store.state.user.site,
+          partNo: '',
+          partDesc: '',
+          customerId: '',
+          customerDesc: '',
          projectId: '',
          projectDesc: '',
          codeNo: '',
@ -799,6 +817,38 @@
            fixed: '',
            columnWidth: 80
          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 108001,
+            serialNumber: '108001Table1PartNo',
+            tableId: '108001Table1',
+            tableName: '技术参数卡',
+            columnProp: 'partNo',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '物料编码',
+            columnHidden: false,
+            columnImage: false,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 108001,
+            serialNumber: '108001Table1PartDesc',
+            tableId: '108001Table1',
+            tableName: '技术参数卡',
+            columnProp: 'partDesc',
+            headerAlign: 'center',
+            align: 'left',
+            columnLabel: '物料名称',
+            columnHidden: false,
+            columnImage: false,
+            status: true,
+            fixed: '',
+            columnWidth: 180
+          },
          {
            userId: this.$store.state.user.name,
            functionId: 108001,
@ -1365,6 +1415,15 @@
    },
    methods: {

+      partInput (row, val) {
+        row.newPartNo = val.toUpperCase()
+      },
+
+      choosePartNo (row) {
+        this.tempPartRow = row
+        this.getBaseList(133)
+      },
+
      ecnTypeHeaderChange (val,index) {
        if (val === 'Y') {
          for (let i = 0; i < this.form[index].list.length; i++) {
@ -2101,6 +2160,9 @@
              }
            }
          }
+          if (val === 133) {
+            strVal = this.tempPartRow.newPartNo
+          }
          this.$refs.baseList.init(val, strVal)
        })
      },
@ -2129,6 +2191,9 @@
            //this.$set(this.costImpactData,'affectedExecutorName',val.user_display)
          }
        }
+        if (this.tagNo === 133) {
+          this.tempPartRow.newPartNo = val.part_no
+        }
      },

      // ======== 导出相关方法 ========
--- a/src/views/modules/customer/customerInformationManagement.vue
+++ b/src/views/modules/customer/customerInformationManagement.vue
@ -42,6 +42,7 @@
      :data="dataList"
      border
      ref="customerTable"
+      :row-style="rowStyle"
      @row-click="customerClickRow"
      @selection-change="selectionCustomer"
      @current-change="changeCurrentRow"
@ -2102,6 +2103,9 @@
          createDate: '',
          createBy: this.$store.state.user.name,
        }
+        if (this.contactList.length === 0) {
+          this.contactModalData.primaryContact = 'Y'
+        }
        this.contactDetailModalFlag = false
        this.contactModalFlag = true
      },
@ -3196,7 +3200,12 @@
        }else {
          this.$router.push({name:"project-projectInfo/projectInfo",params:{projectId:projectId},})
        }
-      }
+      },
+      rowStyle ({row}) {
+        if (this.customerCurrentRow.customerNo === row.customerNo) {
+          return { 'background-color': '#E8F7F6', cursor: 'pointer' };
+        }
+      },
    }
  }
 </script>
--- a/src/views/modules/part/bomManagement.vue
+++ b/src/views/modules/part/bomManagement.vue
--- a/src/views/modules/part/partCatalogInformation.vue
+++ b/src/views/modules/part/partCatalogInformation.vue
@ -35,6 +35,7 @@
      :data="dataList"
      border
      ref="partTable"
+      :row-style="rowStyle"
      @row-click="partClickRow"
      @selection-change="selectionPart"
      @current-change="changeCurrentRow"
@ -174,7 +175,7 @@
      <!-- 物料属性页签 -->
      <el-tab-pane label="物料属性" name="part_item">
        <el-form label-position="top" style="margin-top: 2px; margin-left: 2px;">
-          <el-button type="primary" @click="addOrDelItem">新增/删除</el-button>
+          <el-button type="primary" @click="addOrDelItem">新增</el-button>
          <el-button type="primary" @click="updateItemValue">编辑</el-button>
        </el-form>
        <el-table
@ -1493,7 +1494,7 @@
       * @param row
       */
      partClickRow (row) {
-        this.$refs.partTable.toggleRowSelection(row)
+        // this.$refs.partTable.toggleRowSelection(row)
        this.partCurrentRow = JSON.parse(JSON.stringify(row))
      },
      /**
@ -1586,7 +1587,13 @@
        json += '}'
        let s = eval('(' + json + ')')
        return s
-      }
+      },
+
+      rowStyle ({row}) {
+        if (this.partCurrentRow.partNo === row.partNo) {
+          return { 'background-color': '#E8F7F6', cursor: 'pointer' };
+        }
+      },
    }
  }
 </script>
--- a/src/views/modules/part/partInformation.vue
+++ b/src/views/modules/part/partInformation.vue
@ -59,18 +59,19 @@
      :data="dataList"
      border
      ref="partTable"
+      :row-style="rowStyle"
      @row-click="partClickRow"
      @selection-change="selectionPart"
      @current-change="changeCurrentRow"
      v-loading="dataListLoading"
      style="width: 100%;">
-      <el-table-column
-        type="selection"
-        header-align="center"
-        align="center"
-        :selectable="selectFlag"
-        width="50">
-      </el-table-column>
+<!--      <el-table-column-->
+<!--        type="selection"-->
+<!--        header-align="center"-->
+<!--        align="center"-->
+<!--        :selectable="selectFlag"-->
+<!--        width="50">-->
+<!--      </el-table-column>-->
      <el-table-column
        v-for="(item,index) in columnList" :key="index"
        :sortable="item.columnSortable"
@ -515,7 +516,7 @@
      <!-- 物料属性页签 -->
      <el-tab-pane label="物料属性" name="part_item">
        <el-form label-position="top" style="margin-top: 2px; margin-left: 2px;">
-          <el-button type="primary" @click="addOrDelItem">新增/删除</el-button>
+          <el-button type="primary" @click="addOrDelItem">新增</el-button>
          <el-button type="primary" @click="updateItemValue">编辑</el-button>
        </el-form>
        <el-table
@ -4248,10 +4249,10 @@
       * @param row
       */
      partClickRow (row,column) {
-        if (column.label === '操作'){
-          return
-        }
-        this.$refs.partTable.toggleRowSelection(row)
+        // if (column.label === '操作'){
+        //   return
+        // }
+        // this.$refs.partTable.toggleRowSelection(row)
        this.partCurrentRow = JSON.parse(JSON.stringify(row))
      },
      /**
@ -4547,7 +4548,13 @@
        }else {
          this.$router.push({name:`part-${path}Management`,params:{partNo:row.partNo},})
        }
-      }
+      },
+
+      rowStyle ({row}) {
+        if (this.partCurrentRow.partNo === row.partNo) {
+          return { 'background-color': '#E8F7F6', cursor: 'pointer' };
+        }
+      },
    }
  }
 </script>
--- a/src/views/modules/part/routingManagement.vue
+++ b/src/views/modules/part/routingManagement.vue
@ -459,7 +459,7 @@
        </el-form-item>
      </el-form>
      <el-footer style="height:35px;margin-top:65px;text-align:center">
-        <el-button type="primary" @click="componentDataSave(true)">应用</el-button>
+        <el-button v-if="componentData.flag === '1'" type="primary" @click="componentDataSave(true)">应用</el-button>
        <el-button type="primary" @click="componentDataSave(false)">保存</el-button>
        <el-button type="primary" @click="componentSaveModal = false">关闭</el-button>
      </el-footer>