2025-01-24

优化

src/views/modules/base/propertiesItem/propertiesItem.vue

@@ -653,15 +653,16 @@
         this.modalDisableFlag = false;
         this.modalFlag = true;
       },
-      chooseModal(row){
-        this.chooseModalData.itemNo=row.itemNo;
-        this.chooseModalData.itemDesc=row.itemDesc;
-        this.chooseModalData.valueTypeDb=row.valueTypeDb;
-        this.chooseModalData.itemType=row.itemType;
+      chooseModal (row) {
+        this.chooseModalData.site = row.site;
+        this.chooseModalData.itemNo = row.itemNo;
+        this.chooseModalData.itemDesc = row.itemDesc;
+        this.chooseModalData.valueTypeDb = row.valueTypeDb;
+        this.chooseModalData.itemType = row.itemType;
         searchItemAvailable(this.chooseModalData).then(({data}) => {
           this.chooseTableData = data.rows
         })
-        this.chooseModalFlag=true;
+        this.chooseModalFlag = true;
       },
       updateModal(row){
         this.modalData = {

src/views/modules/common/Chooselist.vue

@@ -196,7 +196,7 @@ export default {
         if (this.param3) {
           sql += " and active like '%" + this.param3 + "%'"
         }
-        let tagNoList = [119, 120, 121, 93, 102]
+        let tagNoList = [119, 120, 121, 93, 102, 22]
         if (this.tagNo <1000 && !tagNoList.includes(this.tagNo)) {
           if (this.param4) {
             sql += " and site=" + "'" + this.param4 + "'"

src/views/modules/part/partCatalogInformation.vue

@@ -114,7 +114,7 @@
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item>
           <span style="cursor: pointer" slot="label" @click="getBaseList(22)"><a herf="#">属性模板</a></span>
-          <el-input v-model="modalData.codeNo" @blur="codeNoBlur(20)" style="width: 120px"></el-input>
+          <el-input v-model="modalData.codeNo" @blur="codeNoBlur(22)" style="width: 120px"></el-input>
           <el-input v-model="modalData.codeDesc" disabled style="width: 330px"></el-input>
         </el-form-item>
         <el-form-item label="批次/批次跟踪">
@@ -337,23 +337,23 @@
             @selection-change="selectionItem1"
             highlight-current-row
             style="width: 100%">
-            <el-table-column
-              type="selection"
-              header-align="center"
-              align="center"
-              width="50">
-            </el-table-column>
+<!--            <el-table-column-->
+<!--              type="selection"-->
+<!--              header-align="center"-->
+<!--              align="center"-->
+<!--              width="50">-->
+<!--            </el-table-column>-->
             <el-table-column
               prop="itNo"
               header-align="center"
-              align="center"
+              align="left"
               min-width="80"
               label="属性编码">
             </el-table-column>
             <el-table-column
               prop="itemDesc"
               header-align="center"
-              align="center"
+              align="left"
               min-width="200"
               label="属性名称">
             </el-table-column>
@@ -361,7 +361,7 @@
         </el-main>
         <el-main style="width: 10px;padding: 1px">
           <div style="margin-top: 200px;margin-left: 18px">
-            <el-button type="primary" @click="addItem()">添加>></el-button>
+<!--            <el-button type="primary" @click="addItem()">添加>></el-button>-->
           </div>
           <div style="margin-top: 15px;margin-left: 18px">
             <el-button type="primary" @click="deleteItem()">删除<<</el-button>
@@ -387,14 +387,14 @@
             <el-table-column
               prop="itNo"
               header-align="center"
-              align="center"
+              align="left"
               min-width="80"
               label="属性编码">
             </el-table-column>
             <el-table-column
               prop="itemDesc"
               header-align="center"
-              align="center"
+              align="left"
               min-width="200"
               label="属性名称">
             </el-table-column>
@@ -680,25 +680,24 @@
             fixed: '',
             columnWidth: 100
           },
-
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104001,
-            serialNumber: '104001Table1GroupName',
-            tableId: '104001Table1',
-            tableName: '物料信息表',
-            columnProp: 'groupName',
-            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: 104001,
+          //   serialNumber: '104001Table1GroupName',
+          //   tableId: '104001Table1',
+          //   tableName: '物料信息表',
+          //   columnProp: 'groupName',
+          //   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: 104001,
@@ -1232,6 +1231,7 @@
           codeNo: this.partCurrentRow.codeNo,
           codeDesc: this.partCurrentRow.codeDesc,
           recordType: 'MP',
+          updateBy: this.$store.state.user.name,
           itemList: this.itemSelections1
         }
         addMasterPartItem(inData).then(({data}) => {
@@ -1253,10 +1253,8 @@
       // 物料项目删除
       deleteItem () {
         if (this.itemSelections2 == null || this.itemSelections2.length === 0) {
-          this.$alert("请选择已有属性！", '提示', {
-            confirmButtonText: '确定'
-          })
-          return false
+          this.$message.warning('请选择已有属性！')
+          return
         }
         let inData = {
           site: '*',
@@ -1264,6 +1262,7 @@
           codeNo: this.partCurrentRow.codeNo,
           codeDesc: this.partCurrentRow.codeDesc,
           recordType: 'MP',
+          updateBy: this.$store.state.user.name,
           itemList: this.itemSelections2
         }
         deleteMasterPartItem(inData).then(({data}) => {
@@ -1299,6 +1298,7 @@
       // 确认修改物料属性
       commitItemValue () {
         let tempData = {
+          updateBy: this.$store.state.user.name,
           itemList: JSON.parse(JSON.stringify(this.updatePartItemList))
         }
         commitItemValue(tempData).then(({data}) => {
@@ -1364,7 +1364,8 @@
           site: '*',
           partNo: this.partCurrentRow.partNo,
           codeNo: this.partCurrentRow.codeNo,
-          recordType: 'MP'
+          recordType: 'MP',
+          updateBy: this.$store.state.user.name,
         }
         getMasterPartItem(tempData).then(({data}) => {
           if (data && data.code === 0) {
@@ -1378,7 +1379,6 @@
       // ======== 列表数据刷新方法 ========
       // 获取数据列表
       getDataList () {
-        this.searchData.site = this.$store.state.user.site
         this.searchData.limit = this.pageSize
         this.searchData.page = this.pageIndex
         masterPartSearch(this.searchData).then(({data}) => {
@@ -1396,8 +1396,6 @@
             } else {
               this.partCurrentRow = {}
             }
-            // 加载当前的页签的table
-            this.refreshCurrentTabTable()
           }
         })
       },

src/views/modules/part/partInformation.vue

@@ -3690,10 +3690,8 @@
       // 物料项目删除
       deleteItem () {
         if (this.itemSelections2 == null || this.itemSelections2.length === 0) {
-          this.$alert("请选择已有属性！", '提示', {
-            confirmButtonText: '确定'
-          })
-          return false
+          this.$message.warning('请选择已有属性！')
+          return
         }
         let inData = {
           site: this.$store.state.user.site,
@@ -3929,8 +3927,6 @@
             } else {
               this.partCurrentRow = {}
             }
-            // 加载当前的页签的table
-            //this.refreshCurrentTabTable()
           }
         })
       },