Browse Source

Merge branch 'develop_12' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh13

# Conflicts:
#	public/version.json
#	src/views/purchasingManagement/purchaseOrder/edit.vue
lilei 2 years ago
parent
commit
f2aefabfca

+ 1 - 1
public/version.json

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

+ 13 - 13
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -21,9 +21,9 @@
           </p></template>
           </p></template>
       </a-page-header>
       </a-page-header>
       <!-- 基础信息 -->
       <!-- 基础信息 -->
-      <div v-if="isShowBisiceInfo" class="bulkWarehousingOrderEdit-cont">
+      <div v-show="isShowBisiceInfo" class="bulkWarehousingOrderEdit-cont">
         <a-collapse :activeKey="['1']">
         <a-collapse :activeKey="['1']">
-          <a-collapse-panel key="1" header="基础信息" :show-arrow="false" :disabled="true">
+          <a-collapse-panel key="1" header="基础信息" :disabled="true">
             <a-row :gutter="16">
             <a-row :gutter="16">
               <a-col class="gutter-row" :span="8">
               <a-col class="gutter-row" :span="8">
                 供应商:{{ (basicInfoData&&basicInfoData.supplierName) || '--' }}
                 供应商:{{ (basicInfoData&&basicInfoData.supplierName) || '--' }}
@@ -50,35 +50,35 @@
               <!-- 搜索条件 -->
               <!-- 搜索条件 -->
               <div class="table-page-search-wrapper">
               <div class="table-page-search-wrapper">
                 <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
                 <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-                  <a-row :gutter="15">
-                    <a-col :md="4" :sm="24">
+                  <a-row type="flex" :gutter="12" justify="start">
+                    <a-col flex="250px">
                       <a-form-model-item label="产品编码">
                       <a-form-model-item label="产品编码">
                         <a-input id="bulkWarehousingOrderEdit-code" ref="searchProductCode" v-model.trim="queryParam.code" allowClear placeholder="请输入产品编码"/>
                         <a-input id="bulkWarehousingOrderEdit-code" ref="searchProductCode" v-model.trim="queryParam.code" allowClear placeholder="请输入产品编码"/>
                       </a-form-model-item>
                       </a-form-model-item>
                     </a-col>
                     </a-col>
-                    <a-col :md="4" :sm="24">
+                    <a-col flex="350px">
                       <a-form-model-item label="产品名称">
                       <a-form-model-item label="产品名称">
                         <a-input id="bulkWarehousingOrderEdit-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
                         <a-input id="bulkWarehousingOrderEdit-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
                       </a-form-model-item>
                       </a-form-model-item>
                     </a-col>
                     </a-col>
-                    <a-col :md="4" :sm="24">
+                    <a-col flex="250px">
                       <a-form-model-item label="原厂编码">
                       <a-form-model-item label="原厂编码">
                         <a-input id="bulkWarehousingOrderEdit-origCode" v-model.trim="queryParam.origCode" allowClear placeholder="请输入原厂编码"/>
                         <a-input id="bulkWarehousingOrderEdit-origCode" v-model.trim="queryParam.origCode" allowClear placeholder="请输入原厂编码"/>
                       </a-form-model-item>
                       </a-form-model-item>
                     </a-col>
                     </a-col>
-                    <a-col :md="4" :sm="24">
-                      <a-form-item label="产品分类">
-                        <ProductType id="productInfoList-productType" @change="changeProductType" v-model="productType"></ProductType>
-                      </a-form-item>
-                    </a-col>
                     <template v-if="advanced">
                     <template v-if="advanced">
-                      <a-col :md="4" :sm="24">
+                      <a-col flex="250px">
+                        <a-form-item label="产品分类">
+                          <ProductType id="productInfoList-productType" @change="changeProductType" v-model="productType"></ProductType>
+                        </a-form-item>
+                      </a-col>
+                      <a-col flex="250px">
                         <a-form-item label="产品品牌">
                         <a-form-item label="产品品牌">
                           <ProductBrand id="bulkWarehousingOrderEdit-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
                           <ProductBrand id="bulkWarehousingOrderEdit-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
                         </a-form-item>
                         </a-form-item>
                       </a-col>
                       </a-col>
                     </template>
                     </template>
-                    <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
+                    <a-col flex="auto" style="margin-bottom: 10px;">
                       <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="bulkWarehousingOrderEdit-refresh">查询</a-button>
                       <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="bulkWarehousingOrderEdit-refresh">查询</a-button>
                       <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="bulkWarehousingOrderEdit-reset">重置</a-button>
                       <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="bulkWarehousingOrderEdit-reset">重置</a-button>
                       <a @click="advanced=!advanced" style="margin:0 30px 0 10px">
                       <a @click="advanced=!advanced" style="margin:0 30px 0 10px">

+ 13 - 13
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -17,9 +17,9 @@
         </template>
         </template>
       </a-page-header>
       </a-page-header>
       <!-- 基础信息 -->
       <!-- 基础信息 -->
-      <div v-if="isShowBisiceInfo" class="purchaseOrderEdit-cont">
+      <div v-show="isShowBisiceInfo" class="purchaseOrderEdit-cont">
         <a-collapse :activeKey="['1']">
         <a-collapse :activeKey="['1']">
-          <a-collapse-panel key="1" :disabled="true" :showArrow="false">
+          <a-collapse-panel key="1" :disabled="true">
             <template slot="header">
             <template slot="header">
               基础信息
               基础信息
             </template>
             </template>
@@ -63,35 +63,35 @@
               <!-- 搜索条件 -->
               <!-- 搜索条件 -->
               <div class="table-page-search-wrapper">
               <div class="table-page-search-wrapper">
                 <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
                 <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-                  <a-row :gutter="15">
-                    <a-col :md="4" :sm="24">
+                  <a-row type="flex" :gutter="12" justify="start">
+                    <a-col flex="250px">
                       <a-form-model-item label="产品编码">
                       <a-form-model-item label="产品编码">
                         <a-input id="purchaseOrderEdit-code" ref="searchProductCode" v-model.trim="queryParam.code" allowClear placeholder="请输入产品编码"/>
                         <a-input id="purchaseOrderEdit-code" ref="searchProductCode" v-model.trim="queryParam.code" allowClear placeholder="请输入产品编码"/>
                       </a-form-model-item>
                       </a-form-model-item>
                     </a-col>
                     </a-col>
-                    <a-col :md="4" :sm="24">
+                    <a-col flex="350px">
                       <a-form-model-item label="产品名称">
                       <a-form-model-item label="产品名称">
                         <a-input id="purchaseOrderEdit-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
                         <a-input id="purchaseOrderEdit-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
                       </a-form-model-item>
                       </a-form-model-item>
                     </a-col>
                     </a-col>
-                    <a-col :md="4" :sm="24">
+                    <a-col flex="250px">
                       <a-form-model-item label="原厂编码">
                       <a-form-model-item label="原厂编码">
                         <a-input id="purchaseOrderEdit-origCode" v-model.trim="queryParam.origCode" allowClear placeholder="请输入原厂编码"/>
                         <a-input id="purchaseOrderEdit-origCode" v-model.trim="queryParam.origCode" allowClear placeholder="请输入原厂编码"/>
                       </a-form-model-item>
                       </a-form-model-item>
                     </a-col>
                     </a-col>
-                    <a-col :md="4" :sm="24">
-                      <a-form-item label="产品分类">
-                        <ProductType id="purchaseOrderEdit-productType" :isDealer="true" :tenantId="$route.params.dealerSn" @change="changeProductType" v-model="productType"></ProductType>
-                      </a-form-item>
-                    </a-col>
                     <template v-if="advanced">
                     <template v-if="advanced">
-                      <a-col :md="4" :sm="24">
+                      <a-col flex="250px">
+                        <a-form-item label="产品分类">
+                          <ProductType id="purchaseOrderEdit-productType" :isDealer="true" :tenantId="$route.params.dealerSn" @change="changeProductType" v-model="productType"></ProductType>
+                        </a-form-item>
+                      </a-col>
+                      <a-col flex="250px">
                         <a-form-item label="产品品牌">
                         <a-form-item label="产品品牌">
                           <ProductBrand id="purchaseOrderEdit-productBrand" :tenantId="$route.params.dealerSn" v-model="queryParam.productBrandSn"></ProductBrand>
                           <ProductBrand id="purchaseOrderEdit-productBrand" :tenantId="$route.params.dealerSn" v-model="queryParam.productBrandSn"></ProductBrand>
                         </a-form-item>
                         </a-form-item>
                       </a-col>
                       </a-col>
                     </template>
                     </template>
-                    <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
+                    <a-col flex="auto" style="margin-bottom: 10px;">
                       <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="purchaseOrderEdit-refresh">查询</a-button>
                       <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="purchaseOrderEdit-refresh">查询</a-button>
                       <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="purchaseOrderEdit-reset">重置</a-button>
                       <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="purchaseOrderEdit-reset">重置</a-button>
                       <a @click="advanced=!advanced" style="margin:0 30px 0 10px">
                       <a @click="advanced=!advanced" style="margin:0 30px 0 10px">