Merge remote-tracking branch 'origin/master'

src/views/modules/part/bomManagement.vue

@@ -2672,7 +2672,7 @@ export default {
     sizeChangeHandle3 (val) {
       this.pageSize3 = val
       this.pageIndex3 = 1
-      this.queryComponentPartModal()
+      this.queryComponentPartList()
     },
 
     /**
@@ -2681,7 +2681,7 @@ export default {
      */
     currentChangeHandle3 (val) {
       this.pageIndex3 = val
-      this.queryComponentPartModal()
+      this.queryComponentPartList()
     },
 
     /**
@@ -3020,10 +3020,10 @@ export default {
         this.$message.warning('请先选择替代！')
         return
       }
-      if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') {
-        this.$message.warning('不可编辑的替代状态!')
-        return
-      }
+      // if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') {
+      //   this.$message.warning('不可编辑的替代状态!')
+      //   return
+      // }
       this.componentData = {
         flag: '1',
         site: this.$store.state.user.site,
@@ -3071,10 +3071,10 @@ export default {
         this.$message.warning('请先选择替代！')
         return
       }
-      if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') {
-        this.$message.warning('不可编辑的替代状态!')
-        return
-      }
+      // if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') {
+      //   this.$message.warning('不可编辑的替代状态!')
+      //   return
+      // }
       this.componentData = {
         flag: '1',
         site: this.$store.state.user.site,
@@ -3118,10 +3118,10 @@ export default {
      * 子明细编辑模态框
      */
     updateComponentModal (row) {
-      if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') {
-        this.$message.warning('不可编辑的替代状态!')
-        return
-      }
+      // if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') {
+      //   this.$message.warning('不可编辑的替代状态!')
+      //   return
+      // }
       this.componentData = {
         flag: '2',
         site: row.site,
@@ -3155,10 +3155,10 @@ export default {
      * 副产品编辑模态框
      */
     updateByProductModal (row) {
-      if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') {
-        this.$message.warning('不可编辑的替代状态!')
-        return
-      }
+      // if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') {
+      //   this.$message.warning('不可编辑的替代状态!')
+      //   return
+      // }
       this.componentData = {
         flag: '2',
         site: row.site,
@@ -3191,10 +3191,10 @@ export default {
      * 副产品成本分配编辑模态框
      */
     updateManufStructCostDistribModal (row) {
-      if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') {
-        this.$message.warning('不可编辑的替代状态!')
-        return
-      }
+      // if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') {
+      //   this.$message.warning('不可编辑的替代状态!')
+      //   return
+      // }
       this.manufStructCostDistribData = {
         site: row.site,
         partNo: row.partNo,
@@ -3585,7 +3585,7 @@ export default {
       this.componentPartData.limit = this.pageSize3
       this.componentPartData.page = this.pageIndex3
       // 查询所有物料
-      queryPartList(this.componentPartData).then(({data}) => {
+      queryPartListAll(this.componentPartData).then(({data}) => {
         if (data && data.code === 0) {
           this.componentPartList = data.page.list
           this.pageIndex3 = data.page.currPage
@@ -3708,10 +3708,10 @@ export default {
      * 删除子物料
      */
     deleteComponentPart () {
-      if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') {
-        this.$message.warning('不可编辑的替代状态!')
-        return
-      }
+      // if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') {
+      //   this.$message.warning('不可编辑的替代状态!')
+      //   return
+      // }
       if (this.checkedDetail.length === 0) {
         this.$message.warning('请选择要删除子物料！')
         return
@@ -3751,10 +3751,10 @@ export default {
      * 删除子物料
      */
     deleteByProduct () {
-      if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') {
-        this.$message.warning('不可编辑的替代状态!')
-        return
-      }
+      // if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') {
+      //   this.$message.warning('不可编辑的替代状态!')
+      //   return
+      // }
       if (this.checkedByProduct.length === 0) {
         this.$message.warning('请选择要删除副产品！')
         return

src/views/modules/part/partCatalogInformation.vue

@@ -524,7 +524,7 @@
           itemDesc: '',
           textValue: '',
           numValue: '',
-          recordType: 'IP'
+          recordType: 'MP'
         },
         // ======== 数据列表 ========
         dataList: [],
@@ -1185,9 +1185,16 @@
           if (data && data.code === 0) {
             this.getMasterPartItem()
             this.attributeDialog = true
-            this.$message.success(data.msg)
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {}
+            })
           } else {
-            this.$message.warning(data.msg)
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
           }
           this.loading = false
         }).catch((error) => {
@@ -1212,7 +1219,7 @@
           site: this.$store.state.user.site,
           partNo: this.partCurrentRow.partNo,
           codeNo: this.partCurrentRow.codeNo,
-          recordType: 'IP'
+          recordType: 'MP'
         }
         getItemLists(tempData).then(({data}) => {
           this.itemList1 = data.rows.row1
@@ -1245,7 +1252,7 @@
           partNo: this.partCurrentRow.partNo,
           codeNo: this.partCurrentRow.codeNo,
           codeDesc: this.partCurrentRow.codeDesc,
-          recordType: 'IP',
+          recordType: 'MP',
           itemList: this.itemSelections1
         }
         addMasterPartItem(inData).then(({data}) => {
@@ -1276,7 +1283,7 @@
           partNo: this.partCurrentRow.partNo,
           codeNo: this.partCurrentRow.codeNo,
           codeDesc: this.partCurrentRow.codeDesc,
-          recordType: 'IP',
+          recordType: 'MP',
           itemList: this.itemSelections2
         }
         deleteMasterPartItem(inData).then(({data}) => {
@@ -1398,7 +1405,7 @@
           site: this.$store.state.user.site,
           partNo: this.partCurrentRow.partNo,
           codeNo: this.partCurrentRow.codeNo,
-          recordType: 'IP'
+          recordType: 'MP'
         }
         getMasterPartItem(tempData).then(({data}) => {
           if (data && data.code === 0) {

src/views/modules/part/partInformation.vue

@@ -4607,10 +4607,6 @@
         //   this.$message.warning('请选择属性模板！')
         //   return
         // }
-        if (this.modalData.flag === '3' && (this.modalData.planningMethod == null || this.modalData.planningMethod === '')) {
-          this.$message.warning('请选择计划方法！')
-          return
-        }
         if (this.modalData.flag === '1') {
           this.saveLoading = true
           partInformationSave(this.modalData).then(({data}) => {
@@ -4641,6 +4637,14 @@
             this.$message.warning('IFS物料编码不能等于PLM物料编码！')
             return
           }
+          if (this.modalData.planningMethod == null || this.modalData.planningMethod === '') {
+            this.$message.warning('请选择计划方法！')
+            return
+          }
+          if (this.modalData.productGroupId3 == null || this.modalData.productGroupId3 === '') {
+            this.$message.warning('请选择会计组！')
+            return
+          }
           this.saveLoading = true
           this.modalData.bomAlternativeList = this.bomAlternativeSelections
           this.modalData.routingAlternativeList = this.routingAlternativeSelections

src/views/modules/part/routingManagement.vue

@@ -3035,10 +3035,10 @@ export default {
         this.$message.warning('请先选择替代！')
         return
       }
-      if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') {
-        this.$message.warning('不可编辑的替代状态!')
-        return
-      }
+      // if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') {
+      //   this.$message.warning('不可编辑的替代状态!')
+      //   return
+      // }
       this.componentData = {
         flag: '1',
         site: this.$store.state.user.site,
@@ -3090,10 +3090,10 @@ export default {
      * 编辑模态框
      */
     updateComponentModal (row) {
-      if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') {
-        this.$message.warning('不可编辑的替代状态!')
-        return
-      }
+      // if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') {
+      //   this.$message.warning('不可编辑的替代状态!')
+      //   return
+      // }
       this.componentData = {
         flag: '2',
         site: row.site,
@@ -3486,10 +3486,10 @@ export default {
      * 删除子物料
      */
     deleteComponentPart () {
-      if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') {
-        this.$message.warning('不可编辑的替代状态!')
-        return
-      }
+      // if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') {
+      //   this.$message.warning('不可编辑的替代状态!')
+      //   return
+      // }
       if (this.checkedDetail.length === 0) {
         this.$message.warning('请选择要删除子物料！')
         return

src/views/modules/project/projectInfo/com_project_puotation.vue

@@ -268,6 +268,42 @@
             fixed: '',
             columnWidth: 100
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 102001,
+            serialNumber: '102001Table1NodeName',
+            tableId: '102001Table1',
+            tableName: '询价信息表',
+            columnProp: 'nodeName',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '节点名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 102001,
+            serialNumber: '102001Table1NodeCreateBy',
+            tableId: '102001Table1',
+            tableName: '询价信息表',
+            columnProp: 'nodeCreateBy',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '节点审批人',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },
         ],
         // 导出 start
         exportData: [],

src/views/modules/project/projectInfo/com_project_sample.vue

@@ -302,6 +302,40 @@
             status: true,
             fixed: '',
             columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 103001,
+            serialNumber: '103001Table1NodeName',
+            tableId: '103001Table1',
+            tableName: '打样信息表',
+            columnProp: 'nodeName',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '节点名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 103001,
+            serialNumber: '103001Table1NodeCreateBy',
+            tableId: '103001Table1',
+            tableName: '打样信息表',
+            columnProp: 'nodeCreateBy',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '节点审批人',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
           },
         ],
         // 导出 start

src/views/modules/project/projectInfo/com_project_test.vue

@@ -267,6 +267,42 @@ export default {
           fixed: '',
           columnWidth: 80
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 103001,
+          serialNumber: '103001Table1NodeName',
+          tableId: '103001Table1',
+          tableName: '测试信息表',
+          columnProp: 'nodeName',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '节点名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 103001,
+          serialNumber: '103001Table1NodeCreateBy',
+          tableId: '103001Table1',
+          tableName: '测试信息表',
+          columnProp: 'nodeCreateBy',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '节点审批人',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
       ],
       // 导出 start
       exportData: [],

src/views/modules/project/projectInfo/projectInfo.vue

@@ -1552,6 +1552,7 @@
           site: this.currentRow.site,
           projectId: this.currentRow.projectId,
           createBy:this.$store.state.user.name,
+          menuId:102001,
           page: 1,
           limit: 1000
         }
@@ -1562,6 +1563,7 @@
           site: this.currentRow.site,
           projectId: this.currentRow.projectId,
           createBy:this.$store.state.user.name,
+          menuId:103001,
           page: 1,
           limit: 1000
         }
@@ -1572,6 +1574,7 @@
           site: this.currentRow.site,
           projectId: this.currentRow.projectId,
           createBy:this.$store.state.user.name,
+          menuId:107001,
           page: 1,
           limit: 1000
         }

src/views/modules/project/projectPart/searchProjectPart.vue

@@ -940,15 +940,18 @@
             this.$refs.technicalSpecification.init(inData)
           }
           if (type==='projectQuotation') {
+            inData.menuId = 102001
             this.$refs.projectQuotation.init(inData)
           }
           // if(type==='quotationHeader'){
           //   this.$refs.quotationHeader.init(inData)
           // }
           if (type==='sample') {
+            inData.menuId = 103001
             this.$refs.sample.init(inData)
           }
           if (type==='test') {
+            inData.menuId = 107001
             this.$refs.test.init(inData)
           }
           if (type==='toolApply') {