bug清单跟踪

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

@@ -36,6 +36,7 @@
   <!-- 搜索按钮 -->
   <div class="filterSelectButton">
     <el-button
+      :disabled=selectItem.disabled
       slot="append"
       icon="el-icon-search"
       v-if="selectItem.searchButton"

fe/PC/src/utils/tableColumns/index.js

@@ -23,7 +23,7 @@ export const ItemBasic = [
   { label: "是否虚拟物料", prop: "isPhantom", type: "filter", filters: "whetherOrNot" },
   { label: "产品类", prop: 'productLine' },
   { label: "E-LEVEL等级", prop: 'elevel' },
-  { label: "物料分类", prop: "itemCategoryDictionary", type: "object", showProp: "ItemCategory" },
+  // { label: "物料分类", prop: "itemCategoryDictionary", type: "object", showProp: "ItemCategory" },
   { label: "颜色", prop: "color" },
   // ---------------------------------------
   { label: "创建时间", prop: "creationTime", type: "dateTime" },

fe/PC/src/utils/tabsDesTions/index.js

@@ -1,6 +1,6 @@
 // 基础信息数据管理
 /**/
-// 物品基础信息 20221212
+// 物品基础信息 20230328
 export const ItemBasic =  [
   { label: "物料代码", prop: 'code' },
   { label: "物料名称", prop: "name" },

fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue

@@ -80,7 +80,6 @@
       :dropdownData="dropdownData"
       :propsData="propsData"
       :tabsDesTions="tabsDesTions"
-      :Butttondata="[]"
       @drawerShut="(val) => (displayDialog.detailsDialog = val)"
       @drawerbutton="drawerbutton"
       @handleCommand="drawerHandle"
@@ -159,7 +158,7 @@ export default {
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
-        { type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "物料代码",disabled:true, 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.editFormData) }, colSpan: 12 },
         { type: "filterSelect", label: "生产线编号", prop: "prodLineCode", optionsLabel: "name", optionsValue: "code", 

fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue

@@ -161,15 +161,27 @@ export default {
         { type: "filterSelect", label: "车间代码", prop: "workshopCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/workshop")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/workshop', 'Workshop', '车间选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "filterSelect", label: "原料库位", prop: "rawLocationCode", optionsLabel: "name", optionsValue: "code", 
-          focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData) }, colSpan: 12 },
+        
+          { type: "filterSelect", label: "原料库位", prop: "rawLocationCode", optionsLabel: "name", optionsValue: "code", 
+          focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",[
+            {logic:"And",column:"type",action:"==",value:"2"},
+          ])},
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData,[
+            {logic:"And",column:"type",action:"==",value:"2"},
+          ]) }, colSpan: 12 },
+        
         { type: "filterSelect", label: "原料库位组", prop: "rawLocationGroupCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location-group")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/location-group', 'LocationGroup', '库位组选择', this.CreateFormData) }, colSpan: 12 },
+        
         { type: "filterSelect", label: "成品库位", prop: "productLocationCode", optionsLabel: "name", optionsValue: "code", 
-          focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData) }, colSpan: 12 },
+          focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",[
+            {logic:"And",column:"type",action:"==",value:"4"},
+          ])},
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData,[
+            {logic:"And",column:"type",action:"==",value:"4"},
+          ]) }, colSpan: 12 },
+        
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
@@ -177,32 +189,45 @@ export default {
         { type: "input", label: "生产线代码", disabled:"true", prop: "code", validType:'numberLetter', colSpan: 12 },
         { type: "input", label: "生产线名称", prop: 'name', colSpan: 12 },
         { type: "select", label: "类型", prop: "type", options: "productionLineType", colSpan: 12 },
+        
         { type: "filterSelect", label: "车间代码", prop: "workshopCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/workshop")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/workshop', 'Workshop', '车间选择', this.editFormData) }, colSpan: 12 },
+        
         { type: "filterSelect", label: "原料库位", prop: "rawLocationCode", optionsLabel: "name", optionsValue: "code", 
-          focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData) }, colSpan: 12 },
+          focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",[
+            {logic:"And",column:"type",action:"==",value:"2"},
+          ])},
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData,[
+            {logic:"And",column:"type",action:"==",value:"2"},
+          ]) }, colSpan: 12 },
+        
         { type: "filterSelect", label: "原料库位组", prop: "rawLocationGroupCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location-group")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/location-group', 'LocationGroup', '库位组选择', this.editFormData) }, colSpan: 12 },
+        
         { type: "filterSelect", label: "成品库位", prop: "productLocationCode", optionsLabel: "name", optionsValue: "code", 
-          focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData) }, colSpan: 12 },
+          focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",[
+            {logic:"And",column:"type",action:"==",value:"4"},
+          ])},
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData,[
+            {logic:"And",column:"type",action:"==",value:"4"},
+          ]) }, colSpan: 12 },
+        
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editRules: {
         cerateRule: {
           code: [{ required: true, trigger: "blur", message: "不可为空" }],
-          rawLocation: [{ required: true, trigger: "change", message: "不可为空" }],
           workshopCode: [{ required: true, trigger: "change", message: "不可为空" }],
-          productLocation: [{ required: true, trigger: "change", message: "不可为空" }],
+          rawLocationCode: [{ required: true, trigger: "change", message: "不可为空" }],
+          productLocationCode: [{ required: true, trigger: "change", message: "不可为空" }],
         },
         editRule: {
-          rawLocation: [{ required: true, trigger: "change", message: "不可为空" }],
           workshopCode: [{ required: true, trigger: "change", message: "不可为空" }],
-          productLocation: [{ required: true, trigger: "change", message: "不可为空" }],
+          rawLocationCode: [{ required: true, trigger: "change", message: "不可为空" }],
+          productLocationCode: [{ required: true, trigger: "change", message: "不可为空" }],
         }
       },
     };