kz-ui-base 1.0.112 → 1.0.114

package/components/customForm/dropDownList.vue

@@ -157,6 +157,7 @@ import {
 import { listEntity, ajaxUrl } from "kz-ui-base/common/src/api/common/common";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import store from "@/store";
 import {
   getSites,
   getWorkAreas,
@@ -627,7 +628,7 @@ export default class dropDownList extends Vue {
               "dictLabel",
               "dictValue"
             );
-            let newitems = [{ text: this.setting.allName?this.setting.allName:"---请选择---", value: undefined }];
+            let newitems = [{ text: this.setting.allName?this.setting.allName:store.state.permission.allName?store.state.permission.allName:"---请选择---", value: undefined }];
             items.forEach((item) => {
               if (item.text.indexOf(this.setting.findValue) != -1) {
                 newitems.push(item);
@@ -732,7 +733,7 @@ export default class dropDownList extends Vue {
             this.setting.displayField || "componentName",
             this.setting.valueField || "id"
           );
-          let newitems = [{ text:this.setting.allName?this.setting.allName:"---请选择---", value: undefined }];
+          let newitems = [{ text:this.setting.allName?this.setting.allName:store.state.permission.allName?store.state.permission.allName:"---请选择---", value: undefined }];
           items.forEach((item: any) => {
             if (item.value) {
               if (
@@ -835,7 +836,7 @@ export default class dropDownList extends Vue {
     if (!valueField) valueField = this.setting.valueField;
     var items = [];
     if (this.setting.isShowPleaseChoose != false)
-      items.push({ text:this.setting.allName?this.setting.allName:"---请选择---", value: undefined });
+      items.push({ text:this.setting.allName?this.setting.allName:store.state.permission.allName?store.state.permission.allName:"---请选择---", value: undefined });
     if (source) {
       this.itemList = source;
       for (var item of source) {
@@ -844,7 +845,7 @@ export default class dropDownList extends Vue {
     }
     /*console.log("下拉",items);*/
     if (this.column.setting && this.column.setting.chooseFirst) {
-      if (items[0].text ==this.setting.allName?this.setting.allName:"---请选择---" || items[0].text == "请选择") {
+      if (items[0].text ==this.setting.allName?this.setting.allName:store.state.permission.allName?store.state.permission.allName:"---请选择---" || items[0].text == "请选择") {
         this.$set(this.entity, String(this.column.property), items[1].text);
         this.onChangeEvent(this.entity[this.column.property], true);
       } else {

package/components/sm/SmOrderSelectModal.vue

@@ -103,7 +103,7 @@ export default class SmOrderSelectModal extends Vue {
   searchObj;
   @Prop({default: false})
   multipleChoice;
-  @Prop({default: '物料选择'})
+  @Prop({default: '销售订单选择'})
   title;
   //表格是否自动加载数据
   dialogType = 2;

package/constant/constant/bd.ts

@@ -88,15 +88,15 @@ export enum ITEM_DIVISION_CODE {
   /**
    * 原材料
    */
-  RAW_MATERIAL = '1',
+  RAW_MATERIAL = '01',
   /**
    * 半成品
    */
-  SEMI_FINISHED_PRODUCT = '2',
+  SEMI_FINISHED_PRODUCT = '03',
   /**
    * 成品
    */
-  FINISHED_PRODUCT = '3',
+  FINISHED_PRODUCT = '04',
   /**
    * 包装物
    */
@@ -108,7 +108,7 @@ export enum ITEM_DIVISION_CODE {
   /**
    * 备品备件
    */
-  SPARE_PARTS = '6'
+  SPARE_PARTS = '05'
 }
 
 export enum INSPECTION_FREQUENCY_CODE {

package/constant/constant/pc.ts

@@ -201,33 +201,6 @@ export enum REEL_STATUS_CODE {
   CANCELLED = '60'
 }
 
-export enum ITEM_DIVISION_CODE {
-  /**
-   * 原材料
-   */
-  RAW_MATERIAL = '1',
-  /**
-   * 半成品
-   */
-  SEMI_FINISHED_PRODUCT = '2',
-  /**
-   * 产成品
-   */
-  FINISHED_PRODUCT = '3',
-  /**
-   * 包装物
-   */
-  PACKAGING = '4',
-  /**
-   * 低值易耗品
-   */
-  LOW_VALUE_CONSUMABLE = '5',
-  /**
-   * 备品备件
-   */
-  SPARE_PARTS = '6'
-}
-
 export enum NUMBERING_STAGE {
   /**
    * 计划阶段

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kz-ui-base",
-  "version": "1.0.112",
+  "version": "1.0.114",
   "description": "",
   "main": "index.js",
   "scripts": {