lilei há 2 anos atrás
pai
commit
d1d30ccb65

+ 1 - 1
public/version.json

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

+ 1 - 1
src/views/purchasingManagement/purchaseOrderNew/list.vue

@@ -30,7 +30,7 @@
                 </a-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="业务状态">
                 <a-select id="purchaseOrderList-billStatus" allowClear v-model="queryParam.billStatus" placeholder="请选择业务状态">
                   <a-select-option value="">全部</a-select-option>

+ 5 - 3
src/views/salesManagement/salesQuery/edit.vue

@@ -66,7 +66,7 @@
         <!-- 搜索条件 -->
         <div class="table-page-search-wrapper">
           <a-row :gutter="15">
-            <a-col :md="24" :lg="14">
+            <a-col :md="24" :lg="12">
               <a-form-model :model="productForm" ref="ruleForm" layout="inline" @keyup.enter.native="$refs.table.refresh(true)" >
                 <a-row :gutter="15">
                   <a-col :md="8" :sm="24">
@@ -88,7 +88,7 @@
                 </a-row>
               </a-form-model>
             </a-col>
-            <a-col :md="24" :lg="10">
+            <a-col :md="24" :lg="12">
               <div style="float:right;overflow: hidden;margin-bottom:10px;">
                 <a-checkbox :value="0" :checked="tbForm.indexOf('AUDIT')>=0" @change="(e)=>{tbFormChange(e,0)}" id="salesQuery-tbsh">同步审核</a-checkbox>
                 <a-checkbox :value="1" :checked="tbForm.indexOf('STOCK_OUT')>=0" @change="(e)=>{tbFormChange(e,1)}" id="salesQuery-tbck">同步出库</a-checkbox>
@@ -109,9 +109,11 @@
                   type="default"
                   v-if="shelfInfo&&shelfInfo.state=='ENABLE'"
                   @click="showShelfModal=true"
+                  style="margin-right:5px;"
                   id="salesEdit-shelf">货架产品</a-button>
                 <a-button
-                  type="link"
+                  type="primary"
+                  ghost
                   @click="delSalerOrder"
                   :loading="delLoading"
                   id="salesEdit-del-all">整单删除</a-button>

+ 3 - 3
src/views/salesManagement/salesQuery/queryPart.vue

@@ -9,7 +9,7 @@
         :rules="rules"
         :model="queryParam"
         @keyup.enter.native="$refs.table.refresh(true)" >
-        <a-row :gutter="5">
+        <a-row type="flex" :gutter="5">
           <a-col :lg="4" :md="6" :sm="12">
             <a-form-model-item label="产品编码">
               <a-input id="productInfoList-code" ref="searchProductCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
@@ -59,7 +59,7 @@
               </a-form-model-item>
             </a-col>
           </template>
-          <a-col :lg="3" :md="8" :sm="12" style="margin-bottom: 10px;">
+          <a-col flex="200px" style="margin-bottom: 10px;">
             <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" id="productInfoList-reset">重置</a-button>
             <a @click="advanced=!advanced" style="margin:0 0 0 10px">
@@ -67,7 +67,7 @@
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>
           </a-col>
-          <a-col :lg="5" :md="8" :sm="12" style="margin-top: 6px;">
+          <a-col flex="240px" style="margin-bottom: 15px;display:flex;align-items:center;">
             <a-checkbox v-model="cost" v-if="$hasPermissions('M_ShowAllCost')" id="salesQuery-cost">成本价</a-checkbox>
             <a-checkbox v-model="cityPrice" id="salesQuery-cityPrice">市级价</a-checkbox>
             <a-checkbox v-model="tyuePrice" v-if="$store.state.user.isShowSpecialPrice==1" id="salesQuery-tyuePrice">特约价</a-checkbox>