【n-pc】原料管理调整完成+编辑后FromFE字段回显bug+下拉选择清空联动bug处理+备品申请

fe/PC/src/components/commonTabel-drawer/index.vue

@@ -434,7 +434,7 @@ export default {
                 this.zdyTableColumns = zdyTableColumnsJSON
                 this.otherData = res
                 // 父子双物料相关信息
-                this.getBaseDataInfo(this.otherData,parent)
+                this.getBaseDataInfo(this.otherData,parent,item,['product','component'])
               }).catch(err => {
                 console.log(err)
                 parent.tableLoading = false
@@ -446,7 +446,7 @@ export default {
                 this.zdyTableColumns = zdyTableColumnsJSON
                 this.otherData = res
                 // 父子双物料相关信息
-                this.getBaseDataInfo(this.otherData,parent)
+                this.getBaseDataInfo(this.otherData,parent,item,['product','component'])
               }).catch(err => {
                 console.log(err)
                 parent.tableLoading = false
@@ -510,7 +510,7 @@ export default {
                 delete zdyTableColumnsJSON[0].type
                 this.zdyTableColumns = zdyTableColumnsJSON
                 this.otherData = res
-                parent.tableLoading = false 
+                this.getBaseDataInfo(this.otherData,parent,item)
               }).catch(err => {
                 console.log(err)
                 parent.tableLoading = false
@@ -549,7 +549,7 @@ export default {
       })
     },
     // 获取其他基础信息前端转义
-    getBaseDataInfo(ortherData,parent,itemProps = ['product','component']){
+    getBaseDataInfo(ortherData,parent,configItem,itemProps = ['itemCode']){
       let _allItemCode = []
       ortherData.forEach(item => {
         for(let i in item){
@@ -575,10 +575,17 @@ export default {
         let _itemsConfig = {}
         res.items.forEach(item=>{ _itemsConfig[item.code] = item })
         ortherData.forEach(item=>{
-          this.$set(item,'productName',_itemsConfig[item.product].name)
-          this.$set(item,'productDesc1',_itemsConfig[item.product].desc1)
-          this.$set(item,'componentName',_itemsConfig[item.component].name)
-          this.$set(item,'componentDesc1',_itemsConfig[item.component].desc1)
+          if(configItem.functionName == 'byComponent' || configItem.functionName == 'byProduct'){
+            this.$set(item,'productName',_itemsConfig[item.product].name)
+            this.$set(item,'productDesc1',_itemsConfig[item.product].desc1)
+            this.$set(item,'componentName',_itemsConfig[item.component].name)
+            this.$set(item,'componentDesc1',_itemsConfig[item.component].desc1)
+          }else{
+            this.$set(item,'item_nameFromFE',_itemsConfig[item.itemCode].name)
+            this.$set(item,'item_desc1FromFE',_itemsConfig[item.itemCode].desc1)
+            this.$set(item,'item_desc2FromFE',_itemsConfig[item.itemCode].desc2)
+            this.$set(item,'item_configurationFromFE',_itemsConfig[item.itemCode].configuration)
+          }
         })
         parent.tableLoading = false
       }).catch(err => {

fe/PC/src/components/currenForm/index.vue

@@ -190,7 +190,7 @@
               :allow-create="item.allowCreate"
               style="width: 100%"
               :placeholder="item.placeholder || '请输入' + item.label"
-              @change="changeSelect(item.prop,$event)"
+              @change="changeSelect(item.prop,$event,item)"
             >
               <el-option
                 v-for="(op, index) in selectOptions(item.options) ||
@@ -843,14 +843,20 @@ export default {
     radioChange(prop, val) {
       this.$emit("radioChange", prop, val)
     },
-    changeInput(prop, val) {
+    changeInput(prop, val,item) {
       this.$emit("changeInput", prop, val)
     },
     clearInput(prop, val) {
       this.$emit("clearInput", prop, val)
     },
-    changeSelect(prop, val) {
-      this.$emit("changeSelect", prop, val)
+    changeSelect(prop, val,item) {
+      //清除联动数据
+      if(item.clearPop){
+        item.clearPop.forEach(c=>{
+          this.searchData[c] = null
+        })
+      }
+      this.$emit("changeSelect", prop, val,item)
     },
     resetCurrenForm() {
       this.$refs.form.resetFields();

fe/PC/src/lang/zh.js

@@ -8,6 +8,7 @@ export default {
     description:'描述',
     status:'状态',
     type:'类型',
+    activeDate:'生效日期',
     creationTime:'创建时间',
     creatorId:'创建者ID',
     lastModificationTime:'上次修改时间',
@@ -15,6 +16,8 @@ export default {
     beginTime:'开始时间',
     endTime:'结束时间',
     operation:'操作',
+    worker:'操作员',
+    status:'状态',
   },
 
   // 所有字段（除了接口监控看板）
@@ -45,6 +48,7 @@ export default {
     manageType:'管理类型',
     supplierCode:'供应商代码',
     supplierName:'供应商名称',
+    supplierAddress:'供应商地址',
     inspectType:'检验类型',
     categoryCode:'分类代码',
     categoryValue:'分类值',

fe/PC/src/mixins/TableMixins.js

@@ -227,6 +227,7 @@ export const tableMixins = {
       if(type != 'props'){
         let _mainData = type == 'table' ? this.tableData : this.propsData.details
         let _valueArr = []
+        if(!_mainData)return
         _mainData.forEach((item)=>{
           for(let i in item){
             if(i.indexOf('itemCode') >= 0){

fe/PC/src/mixins/newAndEdiDialogMixins.js

@@ -22,11 +22,13 @@ export const newAndEdiDialogMixins = {
         if (this.active) {
           this.oldSkipCount = 1;
           this.paging();
+          this.getItemInfoByItemCodeHandle('props')
         }
       } else {
         this.displayDialog.editDialog = false
         if (this.active) {
           this.paging();
+          this.getItemInfoByItemCodeHandle('props')
         }
       }
       this.active = 0

fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue

@@ -85,7 +85,6 @@
       :DrawerLoading="Loading.DrawerLoading"
       :drawer="displayDialog.detailsDialog"
       :propsData="propsData"
-      :Butttondata="[]"
       :tabsDesTions="tabsDesTions"
       :tableLoading="tableLoading"
       :dropdownTabsData="dropdownTabsData"
@@ -206,13 +205,15 @@ export default {
       editOptions: {},
       CreateForm: [
         { type: "input", label: _Names.itemCode, prop: 'code', colSpan: 12, validType:'numberLetter' },
-        { type: "input", label: "物品名称", prop: "name", colSpan: 12 },
-        { type: "input", label: "物品描述1", prop: "desc1", colSpan: 12 },
-        { type: "input", label: "物品描述2", prop: "desc2", colSpan: 12 },
-        { type: "select", label: "状态", prop: "status", options: "itemStatus", colSpan: 12 },
+        { type: "input", label: _Names.itemName, prop: "name", colSpan: 12 },
+        { type: "input", label: _Names.itemDesc1, prop: "desc1", colSpan: 12 },
+        { type: "input", label: _Names.itemDesc2, prop: "desc2", colSpan: 12 },
+        { type: "input", label: "配置", prop: 'configuration', colSpan: 12 },
         { type: "filterSelect", label: "基本计量单位", prop: "basicUom", optionsLabel: "description", optionsValue: "name", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/uom")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/uom', 'Uom', '计量单位选择', this.CreateFormData) }, colSpan: 12 },
+        { type: "input", label: "种类", prop: 'category', colSpan: 12 },
+        { type: "select", label: "状态", prop: "status", options: "itemStatus", colSpan: 12 },
         { type: "select", label: "ABC类", prop: "abcClass", options: "abcClass", clearable: true, filterable: true, allowCreate: true, colSpan: 12 },
         { type: "select", label: "制造件", prop: "canMake", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "采购件", prop: "canBuy", options: "whetherOrNot", colSpan: 12 },
@@ -228,9 +229,7 @@ export default {
         // { type: "input", label: "Elevel", prop: 'elevel', colSpan: 12 },
         // { type: "input", label: "颜色", prop: 'color', colSpan: 12 },
         { label: "类型", prop: 'type', type: "select", options: "ItemTypeBasic", colSpan: 12 },
-        { type: "input", label: "种类", prop: 'category', colSpan: 12 },
         // { type: "input", label: "分组", prop: 'group', colSpan: 12 },
-        { type: "input", label: "配置", prop: 'configuration', colSpan: 12 },
         // { type: "input", label: "版本", prop: 'version', colSpan: 12 },
         // { type: "input", label: "工程变革", prop: 'eco', colSpan: 12 },
         { type: "select", label: "是否虚拟物件", prop: "isPhantom", options: "whetherOrNot", colSpan: 12 },
@@ -239,13 +238,15 @@ export default {
       ],
       editForm: [
         { type: "input", label: _Names.itemCode, prop: 'code', disabled: true, colSpan: 12, validType:'numberLetter' },
-        { type: "input", label: "物品名称", prop: "name", colSpan: 12 },
-        { type: "input", label: "物品描述1", prop: "desc1", colSpan: 12 },
-        { type: "input", label: "物品描述2", prop: "desc2", colSpan: 12 },
-        { type: "select", label: "状态", prop: "status", options: "itemStatus", colSpan: 12 },
+        { type: "input", label: _Names.itemName, prop: "name", colSpan: 12 },
+        { type: "input", label: _Names.itemDesc1, prop: "desc1", colSpan: 12 },
+        { type: "input", label: _Names.itemDesc2, prop: "desc2", colSpan: 12 },
+        { type: "input", label: "配置", prop: 'configuration', colSpan: 12 },
         { type: "filterSelect", label: "基本计量单位", prop: "basicUom", optionsLabel: "description", optionsValue: "name", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/uom")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/uom', 'Uom', '计量单位选择', this.editFormData) }, colSpan: 12 },
+        { type: "input", label: "种类", prop: 'category', colSpan: 12 },
+        { type: "select", label: "状态", prop: "status", options: "itemStatus", colSpan: 12 },
         { type: "select", label: "ABC类", prop: "abcClass", options: "abcClass", clearable: true, filterable: true, allowCreate: true, colSpan: 12 },
         { type: "select", label: "制造件", prop: "canMake", options: "whetherOrNot", disabled: true, colSpan: 12 },
         { type: "select", label: "采购件", prop: "canBuy", options: "whetherOrNot", disabled: true, colSpan: 12 },
@@ -257,17 +258,15 @@ export default {
         { type: "input", label: "有效期", prop: "validity", validType:'number', colSpan: 12 },
         { type: "select", label: "有效期单位", prop: "validityUnit", options: "validityUnit", colSpan: 12 },
         { type: "select", label: "管理类型", prop: "manageType", options: "manageType", colSpan: 12 },
-        { type: "filterSelect", label: "项目", prop: "project", optionsLabel: "name", optionsValue: "code", 
-          focus: (type,val) => { return this.getFilterList(type, val, "basedata/project")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/project', 'Project', '项目选择', this.editFormData) }, colSpan: 12 },
-        { type: "input", label: "Elevel", prop: 'elevel', colSpan: 12 },
-        { type: "input", label: "颜色", prop: 'color', colSpan: 12 },
+        // { type: "filterSelect", label: "项目", prop: "project", optionsLabel: "name", optionsValue: "code", 
+        //   focus: (type,val) => { return this.getFilterList(type, val, "basedata/project")},
+        //   searchButton: (val) => { this.showSerarchPage(val, 'basedata/project', 'Project', '项目选择', this.editFormData) }, colSpan: 12 },
+        // { type: "input", label: "Elevel", prop: 'elevel', colSpan: 12 },
+        // { type: "input", label: "颜色", prop: 'color', colSpan: 12 },
         { label: "类型", prop: 'type', type: "select", options: "ItemTypeBasic", disabled: true, colSpan: 12 },
-        { type: "input", label: "种类", prop: 'category', colSpan: 12 },
-        { type: "input", label: "分组", prop: 'group', colSpan: 12 },
-        { type: "input", label: "配置", prop: 'configuration', colSpan: 12 },
-        { type: "input", label: "版本", prop: 'version', colSpan: 12 },
-        { type: "input", label: "工程变革", prop: 'eco', colSpan: 12 },
+        // { type: "input", label: "分组", prop: 'group', colSpan: 12 },
+        // { type: "input", label: "版本", prop: 'version', colSpan: 12 },
+        // { type: "input", label: "工程变革", prop: 'eco', colSpan: 12 },
         { type: "select", label: "是否虚拟物件", prop: "isPhantom", options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "标包数", prop: 'stdPackQty', validType:'number', colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },

fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue

@@ -117,6 +117,7 @@ export default {
   },
   data () {
     return {
+      showTableBaseFromFE:['configuration','name','desc1','desc2'],
       URL: 'basedata/supplier-item',
       //常用按钮数据
       currenButtonData: [
@@ -167,9 +168,9 @@ export default {
         { type: "input", label: "供应商物品代码", prop: "supplierItemCode", validType:'numberLetter', colSpan: 12 },
         { type: "input", label: "供应商物品名称", prop: "itemName", colSpan: 12 },
         { type: "input", label: "供应商简称", prop: "supplierSimpleName", colSpan: 12 },
-        { type: "input", label: "供应商包装计量单位", prop: "supplierPackUom", colSpan: 12 },
+        // { type: "input", label: "供应商包装计量单位", prop: "supplierPackUom", colSpan: 12 },
         { type: "input", label: "供应商包装数量", prop: "supplierPackQty", validType:'number', colSpan: 12 },
-        { type: "input", label: "版本", prop: "version", colSpan: 12 },
+        // { type: "input", label: "版本", prop: "version", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
@@ -178,9 +179,9 @@ export default {
         { type: "input", label: "供应商物品代码", prop: "supplierItemCode", validType:'numberLetter', colSpan: 12 },
         { type: "input", label: "供应商物品名称", prop: "itemName", colSpan: 12 },
         { type: "input", label: "供应商简称", prop: "supplierSimpleName", colSpan: 12 },
-        { type: "input", label: "供应商包装计量单位", prop: "supplierPackUom", colSpan: 12 },
+        // { type: "input", label: "供应商包装计量单位", prop: "supplierPackUom", colSpan: 12 },
         { type: "input", label: "供应商包装数量", prop: "supplierPackQty", validType:'number', colSpan: 12 },
-        { type: "input", label: "版本", prop: "version", colSpan: 12 },
+        // { type: "input", label: "版本", prop: "version", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editRules: {

fe/PC/src/views/basicData/WarehouseManage/Area.vue

@@ -132,18 +132,18 @@ export default {
         { type: "input", label: "区域代码", prop: "code", colSpan: 12, validType:'numberLetter' },
         { type: "input", label: "区域名称", prop: 'name', colSpan: 12 },
         { type: "select", label: "是否功能区", prop: "isFunctional", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "类型", prop: "areaType", options: "areaType", colSpan: 12 },
+        // { type: "select", label: "类型", prop: "areaType", options: "areaType", colSpan: 12 },
         // { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 },
-        { type: "input", label: "描述", prop: "description", colSpan: 12 },
+        // { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
         { type: "input", label: "区域代码", prop: "code", disabled:"true", colSpan: 12, validType:'numberLetter' },
         { type: "input", label: "区域名称", prop: 'name', colSpan: 12 },
         { type: "select", label: "是否功能区", prop: "isFunctional", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "类型", prop: "areaType", options: "areaType", colSpan: 12 },
+        // { type: "select", label: "类型", prop: "areaType", options: "areaType", colSpan: 12 },
         // { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 },
-        { type: "input", label: "描述", prop: "description", colSpan: 12 },
+        // { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editRules: {

fe/PC/src/views/basicData/WarehouseManage/ItemSafetyStock.vue

@@ -134,7 +134,7 @@ export default {
   },
   data () {
     return {
-      showTableBaseFromFE:['desc1','desc2','configuration'],
+      showTableBaseFromFE:['configuration','name','desc1','desc2'],
       URL: 'basedata/item-safety-stock',
       storeValue: {
         url: '',
@@ -190,32 +190,32 @@ export default {
         { type: "filterSelect", label: _Names.itemCode, prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/item-basic', 'ItemBasic', '区域选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "select", label: "存储关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
+        { type: "select", label: "存储关系类型",clearPop:["storeValue"], prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
         { type: "filterSelect", label: "存储关系代码", prop: "storeValue", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, this.storeValue.url)},
           searchButton: (val) => { this.showSerarchPage(val, this.storeValue.url, this.storeValue.tabColumns, '值选择', this.CreateFormData) }, colSpan: 12 },
         { type: "input", label: "最大库存", validType:'pointNumber', prop: "maxStock", colSpan: 12 },
         { type: "input", label: "最小库存", validType:'pointNumber', prop: "minStock", colSpan: 12 },
         { type: "input", label: "安全库存", validType:'pointNumber', prop: "safetyStock", colSpan: 12 },
-        { type: "input", label: "补料点", validType:'pointNumber', prop: "feedLine", colSpan: 12 },
-        { type: "input", label: "补料数量", validType:'pointNumber', prop: "feedQty", colSpan: 12 },
-        { type: "input", label: "补料单位", prop: "feedUM", colSpan: 12 },
+        // { type: "input", label: "补料点", validType:'pointNumber', prop: "feedLine", colSpan: 12 },
+        // { type: "input", label: "补料数量", validType:'pointNumber', prop: "feedQty", colSpan: 12 },
+        // { type: "input", label: "补料单位", prop: "feedUM", colSpan: 12 },
         { type: "input", label: "备注", prop: "remark", colSpan: 12 },
         // { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
         
       ],
       editForm: [
         { type: "input", label: _Names.itemCode, prop: "itemCode", disabled:"true", colSpan: 12 },
-        { type: "select", label: "存储关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
+        { type: "select", label: "存储关系类型", clearPop:["storeValue"],prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
         { type: "filterSelect", label: "存储关系代码", prop: "storeValue", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, this.ediStoreValue.url)},
           searchButton: (val) => { this.showSerarchPage(val, this.ediStoreValue.url, this.ediStoreValue.tabColumns, '值选择', this.editFormData) }, colSpan: 12 },
         { type: "input", label: "最大库存", validType:'pointNumber', prop: "maxStock", colSpan: 12 },
         { type: "input", label: "最小库存", validType:'pointNumber', prop: "minStock", colSpan: 12 },
         { type: "input", label: "安全库存", validType:'pointNumber', prop: "safetyStock", colSpan: 12 },
-        { type: "input", label: "补料点", validType:'pointNumber', prop: "feedLine", colSpan: 12 },
-        { type: "input", label: "补料数量", validType:'pointNumber', prop: "feedQty", colSpan: 12 },
-        { type: "input", label: "补料单位", prop: "feedUM", colSpan: 12 },
+        // { type: "input", label: "补料点", validType:'pointNumber', prop: "feedLine", colSpan: 12 },
+        // { type: "input", label: "补料数量", validType:'pointNumber', prop: "feedQty", colSpan: 12 },
+        // { type: "input", label: "补料单位", prop: "feedUM", colSpan: 12 },
         { type: "input", label: "备注", prop: "remark", colSpan: 12 },
         // { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
         

fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue

@@ -134,6 +134,7 @@ export default {
   },
   data () {
     return {
+      showTableBaseFromFE:['configuration','name','desc1','desc2'],
       URL: 'basedata/item-store-relation',
       storeValue: {
         url: '',
@@ -193,35 +194,35 @@ export default {
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/item-basic', 'ItemBasic', '区域选择', this.CreateFormData) }, colSpan: 12 },
         { type: "select", label: "存储关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
         { type: "select", label: "是否可用", prop: "enabled", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否定制位置", prop: "isFixed", options: "whetherOrNot", colSpan: 12 },
+        // { type: "select", label: "是否定制位置", prop: "isFixed", options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "主存储容量", prop: "umQty", colSpan: 12, validType:'pointNumber' },
         { type: "input", label: "主存储单位", prop: "storeUM", colSpan: 12 },
         { type: "input", label: "次要存储容量", prop: "altUmQty", colSpan: 12, validType:'pointNumber' },
         { type: "input", label: "次要存储单位", prop: "altUm", colSpan: 12 },
         { type: "select", label: "存储单位", prop: "pramaryUM", options: "pramaryUm", colSpan: 12 },
-        { type: "filterSelect", label: "值", prop: "storeValue", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "库位", prop: "storeValue", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, this.storeValue.url)},
           searchButton: (val) => { this.showSerarchPage(val, this.storeValue.url , this.storeValue.tabColumns, '值选择', this.CreateFormData) }, colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
         // { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
-        { type: "input", label: "占用多库位", prop: 'multiLoc',  disabled:"true", colSpan: 12 },
+        // { type: "input", label: "占用多库位", prop: 'multiLoc',  disabled:"true", colSpan: 12 },
       ],
       editForm: [
         { type: "input", label: _Names.itemCode, prop: "itemCode", disabled:"true", colSpan: 12 },
         { type: "select", label: "存储关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
         { type: "select", label: "是否可用", prop: "enabled", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否定制位置", prop: "isFixed", options: "whetherOrNot", colSpan: 12 },
+        // { type: "select", label: "是否定制位置", prop: "isFixed", options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "主存储容量", prop: "umQty", colSpan: 12, validType:'pointNumber' },
         { type: "input", label: "主存储单位", prop: "storeUM", colSpan: 12 },
         { type: "input", label: "次要存储容量", prop: "altUmQty", colSpan: 12, validType:'pointNumber' },
         { type: "input", label: "次要存储单位", prop: "altUm", colSpan: 12 },
         { type: "select", label: "存储单位", prop: "pramaryUM", options: "pramaryUm", colSpan: 12 },
-        { type: "filterSelect", label: "值", prop: "storeValue", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "库位", prop: "storeValue", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, this.ediStoreValue.url)},
           searchButton: (val) => { this.showSerarchPage(val, this.ediStoreValue.url , this.ediStoreValue.tabColumns, '值选择', this.editFormData) }, colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
         // { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
-        { type: "input", label: "占用多库位", prop: 'multiLoc',  disabled:"true", colSpan: 12 },
+        // { type: "input", label: "占用多库位", prop: 'multiLoc',  disabled:"true", colSpan: 12 },
       ],
       editRules: {
         cerateRule: {

fe/PC/src/views/basicData/WarehouseManage/Location.vue

@@ -118,6 +118,7 @@ export default {
   },
   data () {
     return {
+      showTableBaseFromFE:['configuration','name','desc1','desc2'],
       URL: 'basedata/Location',
       tableLoading: false,
       //常用按钮数据
@@ -362,7 +363,7 @@ export default {
           name: 'kwljgx',
           url: 'basedata/item-store-relation',
           tableColumns: 'ItemStoreRelation',
-          functionName: 'relationByLocationCode'
+          functionName: 'relationByLocationCode',
         },
         {
           label: "库存余额",

fe/PC/src/views/basicData/WarehouseManage/LocationGroup.vue

@@ -209,9 +209,9 @@ export default {
         { type: "input", label: "库位组名称", prop: 'name', colSpan: 12 },
         { type: "select", label: "库位组类型", prop: "groupType", options: "locationType", colSpan: 12 },
         { type: "select", label: "默认库存状态", prop: "defaultInventoryStatus", options: "inventoryStage", colSpan: 12 },
-        { type: "input", label: "拣料优先级", prop: "pickPriority", colSpan: 12 },
-        { type: "input", label: "描述", prop: "description", colSpan: 12 },
-        { type: "input", label: "溢流库位组", prop: "overflowLocationGroup", colSpan: 12 },
+        // { type: "input", label: "拣料优先级", prop: "pickPriority", colSpan: 12 },
+        // { type: "input", label: "描述", prop: "description", colSpan: 12 },
+        // { type: "input", label: "溢流库位组", prop: "overflowLocationGroup", colSpan: 12 },
         { type: "select", label: "是否混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
@@ -228,23 +228,7 @@ export default {
         { type: "select", label: "是否接收客户退货", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否拆箱", prop: "enableSplitBox", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否拆托", prop: "enableSplitPallet", options: "whetherOrNot", colSpan: 12 },
-        // { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12  },
-        // { type: "objectSelect", label: "是否混物品", prop: "locSwitch", showProp: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
-        // { type: "objectSelect", label: "是否混批次", prop: "locSwitch", showProp: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
-        // { type: "objectSelect", label: "是否混状态", prop: "locSwitch", showProp: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
-        // { type: "objectSelect", label: "是否负库存", prop: "locSwitch", showProp: "enableNegative", options: "whetherOrNot", colSpan: 12 },
-        // { type: "objectSelect", label: "是否保留零库存", prop: "locSwitch", showProp: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
-        // { type: "objectSelect", label: "是否动态盘点", prop: "locSwitch", showProp: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
-        // { type: "objectSelect", label: "是否领料", prop: "locSwitch", showProp: "enablePick", options: "whetherOrNot", colSpan: 12 },
-        // { type: "objectSelect", label: "是否过量领料", prop: "locSwitch", showProp: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
-        // { type: "objectSelect", label: "是否整包存储", prop: "locSwitch", showProp: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
-        // { type: "objectSelect", label: "是否散件存储", prop: "locSwitch", showProp: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
-        // { type: "objectSelect", label: "是否发出", prop: "locSwitch", showProp: "enableShip", options: "whetherOrNot", colSpan: 12 },
-        // { type: "objectSelect", label: "是否接收", prop: "locSwitch", showProp: "enableReceive", options: "whetherOrNot", colSpan: 12 },
-        // { type: "objectSelect", label: "是否退货给供应商", prop: "locSwitch", showProp: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
-        // { type: "objectSelect", label: "是否接收客户退货", prop: "locSwitch", showProp: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
-        { type: "input", label: "描述", prop: 'description', colSpan: 12 },
       ],
       editForm: [
         { type: "filterSelect", label: "区域代码", prop: "areaCode", optionsLabel: "name", optionsValue: "code", 
@@ -254,9 +238,9 @@ export default {
         { type: "input", label: "库位组名称", prop: 'name', colSpan: 12 },
         { type: "select", label: "库位组类型", prop: "groupType", options: "locationType", colSpan: 12 },
         { type: "select", label: "默认库存状态", prop: "defaultInventoryStatus", options: "inventoryStage", colSpan: 12 },
-        { type: "input", label: "拣料优先级", prop: "pickPriority", colSpan: 12 },
-        { type: "input", label: "描述", prop: "description", colSpan: 12 },
-        { type: "input", label: "溢流库位组", prop: "overflowLocationGroup", colSpan: 12 },
+        // { type: "input", label: "拣料优先级", prop: "pickPriority", colSpan: 12 },
+        // { type: "input", label: "描述", prop: "description", colSpan: 12 },
+        // { type: "input", label: "溢流库位组", prop: "overflowLocationGroup", colSpan: 12 },
         { type: "select", label: "是否混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
@@ -273,9 +257,7 @@ export default {
         { type: "select", label: "是否接收客户退货", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否拆箱", prop: "enableSplitBox", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否拆托", prop: "enableSplitPallet", options: "whetherOrNot", colSpan: 12 },
-        // { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12  },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
-        { type: "input", label: "描述", prop: 'description', colSpan: 12 },
       ],
       editRules: {
         cerateRule: {
@@ -283,14 +265,14 @@ export default {
             { required: true, trigger: "blur", message: "不可为空" },
           ],
           areaCode: [{ required: true, trigger: "change", message: "不可为空" }],
-          pickPriority: [{ required: true, trigger: "blur", message: "不可为空" }],
+          // pickPriority: [{ required: true, trigger: "blur", message: "不可为空" }],
           name: [{ required: true, trigger: "blur", message: "不可为空" }],//编辑必选
           defaultInventoryStatus: [{ required: true, trigger: "blur", message: "不可为空" }],//编辑必选
         },
         editRule: {
           name: [{ required: true, trigger: "blur", message: "不可为空" }],//编辑必选
           areaCode: [{ required: true, trigger: "change", message: "不可为空" }],
-          pickPriority: [{ required: true, trigger: "blur", message: "不可为空" }],
+          // pickPriority: [{ required: true, trigger: "blur", message: "不可为空" }],
           defaultInventoryStatus: [{ required: true, trigger: "blur", message: "不可为空" }],//编辑必选
         }
       },

fe/PC/src/views/basicData/itemGuideBookManage/itemGuideBook.vue

@@ -61,6 +61,8 @@
       @tableButtonClick="searchSubmit(arguments)"
     ></searchPage>
     <!--抽屉-->
+    <!-- :column="1"
+      direction="vertical" -->
     <curren-Drawer
       :title="tableColumns"
       :DrawerLoading="Loading.DrawerLoading"
@@ -69,8 +71,6 @@
       :propsData="propsData"
       :tabsDesTions="tabsDesTions"
       :tableLoading="tableLoading"
-      :column="1"
-      direction="vertical"
       @drawerShut="(val) => (displayDialog.detailsDialog = val)"
       @drawerbutton="drawerbutton"
       @handleCommand="drawerHandle"
@@ -181,7 +181,7 @@ export default {
           formFile: [{ required: true, trigger: "blur", message: "不可为空" }],
         },
         editRule: {
-          itemName: [{ required: true, trigger: "blur", message: "不可为空" }],
+          // itemName: [{ required: true, trigger: "blur", message: "不可为空" }],
         }
       },
     };

fe/PC/src/views/materialIssueBP/IssueRequestBP.vue

@@ -101,7 +101,7 @@ export default {
   },
   data() {
     return {
-      URL: "wms/store/assemble-issue-request",
+      URL: "wms/store/spare-part-issue-request",
       //常用按钮数据
       currenButtonData: [
         this.defaultImportBtn(),//导入
@@ -117,7 +117,7 @@ export default {
           name: "handleGetIds",
           hide: () => { return this.hideButton([1,5,9]) },
           size: 'mini',
-          handleGetJobsUrl:'wms/store/assemble-issue-job',
+          handleGetJobsUrl:'wms/store/spare-part-issue-job',
           // handleRequestUrl:'wms/store/kitting-issue-request',
         },
         {

fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue

@@ -1086,24 +1086,27 @@ export default {
               // 更新数据============================================================
               that.inspectNoticeDetailsShow = false
               this.loading = false
-              getDetailed(that.propsData.id, that.URL).then(res => {
-                that.propsData = res
+              getDetailed(that.propsData.id, that.URL).then(res1 => {
+                that.propsData = res1
               })
               that.paging()
               that.$message.success('成功完成检验！')
             }).catch(err => {
               that.loading = false
-              that.$message.error('检验失败，请重试！')
+              that.$message.error('检验失败,请重试!')
               console.log(err)
             })
           }
         } else {
-          completeSummaryDetailStatus({id: that.masterID, summaryDetailId: that.inspectNoticeDetailsFormData.id }, that.inspectNoticeDetailsFormData).then(res => {
+          completeSummaryDetailStatus(
+            {id: that.masterID, summaryDetailId: that.inspectNoticeDetailsFormData.id }, 
+            that.inspectNoticeDetailsFormData
+          ).then(res => {
             // 更新数据============================================================
             that.inspectNoticeDetailsShow = false
             this.loading = false
-            getDetailed(that.propsData.id, that.URL).then(res => {
-              that.propsData = res
+            getDetailed(that.propsData.id, that.URL).then(res1 => {
+              that.propsData = res1
             })
             that.paging()
             that.$message.success('成功完成检验！')