ソースを参照

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

# Conflicts:
#	public/version.json
lilei 2 年 前
コミット
3245c755a7

+ 1 - 1
public/version.json

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

+ 12 - 12
src/views/chainReportData/chainTransferReport/detailList.vue

@@ -28,18 +28,18 @@
               <outTenant id="chainTransferInReport-outTenantSn" v-model="queryParam.outTenantSn"></outTenant>
             </a-form-item>
           </a-col>
-          <a-col :md="4" :sm="24">
-            <a-form-item label="调拨产品类型">
-              <v-select
-                v-model="queryParam.allocationType"
-                ref="allocationType"
-                id="chainTransferInReport-allocationType"
-                code="ALLOCATION_LINKAGE_PRODUCT_TYPE"
-                placeholder="请选择调拨产品类型"
-                allowClear></v-select>
-            </a-form-item>
-          </a-col>
           <template v-if="advanced">
+            <a-col :md="4" :sm="24">
+              <a-form-item label="调拨产品类型">
+                <v-select
+                  v-model="queryParam.allocationType"
+                  ref="allocationType"
+                  id="chainTransferInReport-allocationType"
+                  code="ALLOCATION_LINKAGE_PRODUCT_TYPE"
+                  placeholder="请选择调拨产品类型"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
             <a-col :md="4" :sm="24">
               <a-form-model-item label="产品编码">
                 <a-input id="chainTransferInReport-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
@@ -61,7 +61,7 @@
               </a-form-model-item>
             </a-col>
           </template>
-          <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
+          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="chainTransferInReport-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="chainTransferInReport-reset">重置</a-button>
             <a-button

+ 16 - 16
src/views/reportData/urgentItemsOffsetReport/detailList.vue

@@ -28,23 +28,23 @@
               <a-input id="urgentItemsOffsetReport-bizBillNo" v-model.trim="queryParam.bizBillNo" allowClear placeholder="请输入销售单号"/>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-model-item label="客户名称">
-              <a-input id="urgentItemsOffsetReport-buyerName" v-model.trim="queryParam.buyerName" allowClear placeholder="请输入客户名称"/>
-            </a-form-model-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="急件类型">
-              <v-select
-                v-model="queryParam.bizType"
-                ref="status"
-                id="urgentItemsOffsetReport-biztype"
-                code="URGENT_BIZ_TYPE"
-                placeholder="急件类型"
-                allowClear></v-select>
-            </a-form-item>
-          </a-col>
           <template v-if="advanced">
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="客户名称">
+                <a-input id="urgentItemsOffsetReport-buyerName" v-model.trim="queryParam.buyerName" allowClear placeholder="请输入客户名称"/>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="急件类型">
+                <v-select
+                  v-model="queryParam.bizType"
+                  ref="status"
+                  id="urgentItemsOffsetReport-biztype"
+                  code="URGENT_BIZ_TYPE"
+                  placeholder="急件类型"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="产品编码">
                 <a-input id="urgentItemsOffsetReport-code" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>