kz-ui-base 1.0.125 → 1.0.127

package/components/sm/SmOrderSelectModal.vue

@@ -17,6 +17,23 @@
                     <el-input clearable v-model="searchParams.salesContractName" placeholder="请输入销售合同名称"></el-input>
                   </el-form-item>
                 </el-col>
+                <el-col :span="6">
+                  <el-form-item label="产品种类" prop="prodCategoryCode">
+                    <dict-select clearable type="prod_category_code" v-model="searchParams.prodCategoryCode" placeholder="请输入产品种类"></dict-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="物料种类" prop="materialClass">
+                    <el-select v-model="searchParams.materialClass" clearable placeholder="请选择物料种类">
+                      <el-option
+                        v-for="item in itemCategoryOptions"
+                        :key="item.id"
+                        :label="item.itemCategoryName"
+                        :value="item.id"
+                      />
+                  </el-select>
+                  </el-form-item>
+                </el-col>
               </el-row>
 
               <div style="float: right; margin-top: 6px">
@@ -88,6 +105,7 @@ import {getDictLabelByValue} from "@api/common/common";
 import EntitySelect from "@srcComponents/selector/EntitySelect.vue";
 import {tableHandleSelect, tableOnSelectionChange, tableRowClick, tableRowStyle} from "@utils/index";
 import {salesOrderDetails} from "@srcApi/sm/cm/salesContract";
+import { getItemCategoryAll } from '@srcApi/bd/itemCategory'
 
 
 @Component({
@@ -108,6 +126,7 @@ export default class SmOrderSelectModal extends Vue {
   dialogType = 2;
   visible = false;
   listData = [];
+  itemCategoryOptions: [];
   tableLoading = false;
   loadingParams = false;
   // 点击的选中行
@@ -120,6 +139,8 @@ export default class SmOrderSelectModal extends Vue {
     materialNo: undefined,
     isFinished: true,
     documentStatusCode: '3',
+    prodCategoryCode: undefined,
+    materialClass: undefined,
     total: 0,
     page:{
       current: 1,
@@ -169,6 +190,12 @@ export default class SmOrderSelectModal extends Vue {
     this.getList();
   }
 
+  loadItemCategory() {
+      getItemCategoryAll().then(response => {
+        this.itemCategoryOptions = response.data
+      })
+  }
+  
   getList() {
     this.tableLoading = true;
     if (this.searchObj != null) {
@@ -203,6 +230,8 @@ export default class SmOrderSelectModal extends Vue {
   resetQuery(){
     this.$set(this.searchParams,'salesOrderNo', null);
     this.$set(this.searchParams,'salesContractName', null);
+    this.$set(this.searchParams,'prodCategoryCode', null);
+    this.$set(this.searchParams,'materialClass', null);
   }
 
   clickRow(row) {
@@ -216,6 +245,7 @@ export default class SmOrderSelectModal extends Vue {
   }
 
   created() {
+    this.loadItemCategory()
     this.getList();
   }
 }

package/package.json

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

package/views/bd/common/modal/ItemModal.vue

@@ -356,6 +356,14 @@ export default class itemModal extends Vue {
       this.listData = res.data;
       this.tableLoading = false;
       this.searchParams.total = (res as any).total;
+      //自动选中第一行
+      this.$nextTick(() => {
+        if (this.listData.length > 0 && this.$refs.multipleTable) {
+          const firstRow = this.listData[0];
+          (this.$refs.multipleTable as any).toggleRowSelection(firstRow, true);
+          this.currentEntities = [firstRow]; 
+        }
+      });
     });
   }
 

package/views/fd/common/modal/StorageZoneModal.vue

@@ -70,7 +70,7 @@ export default class StorageZoneModalList extends ListBasePage {
   }
 
   created() {
-    listSite().then(res => {
+    listSite({pageSize: 99999}).then(res => {
       this.siteMap = {};
       this.siteList = res.data;  // 条件部 - dropDownList用
       for (let data of res.data) {

package/views/pd/common/modal/technicalStandardModal.vue

@@ -33,19 +33,19 @@
 
               <el-col :span="6" style="white-space:nowrap">
                 <el-form-item label="标准名称" class="search-panel">
-                  <el-input style="width:100%;" v-model="searchParams.technicalStandardName"></el-input>
+                  <el-input style="width:80%;" v-model="searchParams.technicalStandardName"></el-input>
                 </el-form-item>
               </el-col>
 
               <el-col :span="6" style="white-space:nowrap">
                 <el-form-item label="标准代号" class="search-panel">
-                  <el-input style="width:100%;" v-model="searchParams.technicalStandardCode"></el-input>
+                  <el-input style="width:80%;" v-model="searchParams.technicalStandardCode"></el-input>
                 </el-form-item>
               </el-col>
 
               <el-col :span="6" style="white-space:nowrap">
                 <el-form-item label="产品种类" class="search-panel">
-                  <dict-select type="prod_category_code" v-model="searchParams.prodCategoryCode" style="width:100%;" :disabled="prodCategoryCode != null" clearable></dict-select>
+                  <dict-select type="prod_category_code" v-model="searchParams.prodCategoryCode" style="width:80%;" :disabled="prodCategoryCode != null" clearable></dict-select>
                 </el-form-item>
               </el-col>