lilei пре 2 година
родитељ
комит
dde182b9e4

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.2.16",
+    "version": "2.2.17",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 1 - 0
src/views/inventoryManagement/inventoryCheck/list.vue

@@ -230,6 +230,7 @@ export default {
       this.queryParam.checkWarehouseNo = ''
       this.queryParam.checkState = undefined
       this.queryParam.checkSuperviseState = undefined
+      this.queryParam.warehouseSn = undefined
       this.$refs.table.refresh(true)
     },
     closeModal () {

+ 2 - 0
src/views/purchasingManagement/bulkWarehousingOrder/basicInfoModal.vue

@@ -141,6 +141,8 @@ export default {
       if (!newValue) {
         this.$emit('close')
         this.$refs.ruleForm.resetFields()
+      }else{
+        this.form.warehouseSn = this.isShowWarehouse ? undefined : this.defWarehouse.warehouseSn
       }
     }
   }

+ 3 - 2
src/views/purchasingManagement/purchaseReturn/addModal.vue

@@ -186,12 +186,13 @@ export default {
         this.$nextTick(() => {
           this.$refs.attachList.setFileList('')
           this.$refs.ruleForm.resetFields()
-          // 默认仓库
-          this.form.warehouseSn = this.isShowWarehouse ? undefined : this.defWarehouse&&this.defWarehouse.warehouseSn
         })
       } else {
         if (this.itemSn) {
           this.getDetail()
+        }else{
+          // 默认仓库
+          this.form.warehouseSn = this.isShowWarehouse ? undefined : this.defWarehouse&&this.defWarehouse.warehouseSn
         }
       }
     }

+ 8 - 8
src/views/salesManagement/receiptPrint/list.vue

@@ -24,11 +24,16 @@
                   <a-input id="salesCollectionList-bookNo" v-model.trim="queryParam.bookNo" allowClear placeholder="请输入备货单号"/>
                 </a-form-item>
               </a-col>
-              <a-col :md="5" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="客户名称">
                   <dealerSearchList ref="payerName" id="alesCollectionList-payerName" @change="custChange" />
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24" v-show="isShowWarehouse">
+                <a-form-model-item label="仓库">
+                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24" v-if="currentTab == 1">
                 <a-form-item label="收款打印状态">
                   <v-select
@@ -52,13 +57,8 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24" v-show="isShowWarehouse">
-                <a-form-model-item label="仓库">
-                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="currentTab==2?4:24" :sm="24">
-                <span class="table-page-search-submitButtons">
+              <a-col :md="currentTab==2?24:6" :sm="24">
+                <span class="table-page-search-submitButtons" :style="{float:currentTab==2?'right':'none'}">
                   <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                   <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
                 </span>

+ 2 - 2
src/views/salesManagement/salesQuery/edit.vue

@@ -6,9 +6,9 @@
         <template slot="subTitle">
           <a id="salesEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <span style="margin: 0 15px;color: #666;">客户名称:{{ detailData&&detailData.buyerName }}</span>
-          <div style="width:420px;display:inline-block;color: #666;">
+          <div style="margin: 0 15px;display:inline-block;color: #666;">
             <span>出库仓库:</span>
-            <chooseWarehouse style="width:80%" ref="warehouse" v-model="warehouseSn" @change="handleWarehouse"></chooseWarehouse>
+            <chooseWarehouse style="width:200px" :allowClear="false" ref="warehouse" v-model="warehouseSn" @change="handleWarehouse"></chooseWarehouse>
           </div>
         </template>
       </a-page-header>

+ 2 - 2
src/views/salesReturnManagement/pickUp/list.vue

@@ -54,8 +54,8 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="24" :sm="24">
-              <div class="table-page-search-submitButtons" style="text-align:center;">
+            <a-col :md="6" :sm="24">
+              <div class="table-page-search-submitButtons">
                 <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                 <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
                 <a @click="advanced=!advanced" style="margin-left: 8px">

+ 2 - 2
vue.config.js

@@ -107,9 +107,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.2.103/ocs-admin',
+        // target: 'http://192.168.2.103/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        // target: 'http://p.ocs.360arrow.com/ocs-admin', //  预发布
+        target: 'http://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {