lilei 2 年之前
父節點
當前提交
d07ff37249

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1675825903076
+  "version": 1675840752048
 }

+ 3 - 1
src/views/common/shopingCatModal.vue

@@ -40,7 +40,9 @@ export default {
     showModal (newValue, oldValue) {
       this.visible = newValue
       if (newValue) {
-         this.$refs.shopingCat.pageInit()
+         setTimeout(()=>{
+           this.$refs.shopingCat.pageInit()
+         },200)
       }
     },
   },

+ 2 - 2
src/views/purchasingManagement/purchaseOrderNew/edit.vue

@@ -75,12 +75,12 @@
               <a-col :span="24">
                 <a-form-model :model="productForm" layout="inline" @keyup.enter.native="$refs.purchaseTable.refresh(true)" >
                   <a-row :gutter="15">
-                    <a-col :md="8" :sm="24">
+                    <a-col :md="6" :sm="24">
                       <a-form-model-item label="产品编码">
                         <a-input v-model.trim="productForm.productCode" allowClear placeholder="输入产品编码" />
                       </a-form-model-item>
                     </a-col>
-                    <a-col :md="8" :sm="24">
+                    <a-col :md="6" :sm="24">
                       <a-form-model-item label="产品名称">
                         <a-input v-model.trim="productForm.productName" allowClear placeholder="输入产品名称" />
                       </a-form-model-item>

+ 5 - 12
src/views/purchasingManagement/purchaseOrderNew/list.vue

@@ -4,8 +4,8 @@
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
+          <a-row type="flex" :gutter="15">
+            <a-col flex="400px">
               <a-form-item label="创建时间">
                 <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
               </a-form-item>
@@ -16,7 +16,7 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="供应商" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+              <a-form-item label="供应商">
                 <a-select
                   id="purchaseOrderList-purchaseTargetSn"
                   placeholder="请选择供应商"
@@ -30,15 +30,8 @@
                 </a-select>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24" v-show="advanced">
+            <a-col :md="6" :sm="24">
               <a-form-item label="业务状态">
-                <!-- <v-select
-                  v-model="queryParam.billStatus"
-                  ref="billStatus"
-                  id="purchaseOrderList-billStatus"
-                  code="PURCHASE_BILL_STATUS"
-                  placeholder="请选择业务状态"
-                  allowClear></v-select> -->
                 <a-select id="purchaseOrderList-billStatus" allowClear v-model="queryParam.billStatus" placeholder="请选择业务状态">
                   <a-select-option value="">全部</a-select-option>
                   <a-select-option value="WAIT_SUBMIT">待提交</a-select-option>
@@ -57,7 +50,7 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="6" :sm="24" v-show="advanced">
               <a-form-item label="单据来源">
                 <v-select
                   v-model="queryParam.purchaseBillSource"