lilei 1 rok pred
rodič
commit
19f98e813b

+ 1 - 1
public/version.json

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

+ 2 - 1
src/views/allocationManagement/storeTransferOut/list.vue

@@ -44,6 +44,7 @@
                     v-model="queryParam.state"
                     ref="state"
                     id="storeTransferOutList-state"
+                    @change="setIsHomeNav($route.name, null)"
                     code="STORE_CALL_OUT_STATE"
                     placeholder="请选择业务状态"
                     allowClear
@@ -298,7 +299,7 @@ export default {
       this.$refs.outWareRangeDate.resetDate('')
       this.queryParam.outWarehouseBeginDate = ''
       this.queryParam.outWarehouseEndDate = ''
-      if(this.advanced){
+      if (this.advanced) {
         this.$refs.custList.resetForm()
       }
       this.queryParam.customerSnCurrent = undefined

+ 1 - 0
src/views/allocationManagement/warehouseAllocation/list.vue

@@ -35,6 +35,7 @@
                   <v-select
                     v-model="queryParam.state"
                     ref="state"
+                    @change="setIsHomeNav($route.name, null)"
                     id="warehouseAllocationList-state"
                     code="ALLOCATION_WAREHOUSE_STATE"
                     placeholder="请选择业务状态"

+ 7 - 1
src/views/bulkManagement/bulkReturnGoods/list.vue

@@ -42,7 +42,13 @@
               </a-col>
               <a-col :md="3" :sm="24">
                 <a-form-item label="业务状态">
-                  <v-select code="SPARE_PARTS_RETURN" id="bulkReturnGoodsList-state" v-model="queryParam.state" allowClear placeholder="请选择"></v-select>
+                  <v-select
+                    code="SPARE_PARTS_RETURN"
+                    id="bulkReturnGoodsList-state"
+                    @change="setIsHomeNav($route.name, null)"
+                    v-model="queryParam.state"
+                    allowClear
+                    placeholder="请选择"></v-select>
                 </a-form-item>
               </a-col>
               <a-col :md="3" :sm="24">

+ 1 - 0
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -36,6 +36,7 @@
                     v-model="queryParam.state"
                     ref="state"
                     id="bulkWarehousingOrderList-state"
+                    @change="setIsHomeNav($route.name, null)"
                     code="SPARE_PARTS_PURCHASE"
                     placeholder="请选择业务状态"
                     allowClear

+ 1 - 0
src/views/financialManagement/financialCollection/list.vue

@@ -28,6 +28,7 @@
                   <v-select
                     v-model="queryParam.billState"
                     ref="settleState"
+                    @change="setIsHomeNav($route.name, null)"
                     id="financialCollectionList-settleState"
                     code="SETTLE_RECEIVE_STATUS"
                     placeholder="请选择单据状态"

+ 1 - 0
src/views/financialManagement/financialPayment/list.vue

@@ -28,6 +28,7 @@
                   <v-select
                     v-model="queryParam.billState"
                     ref="settleState"
+                    @change="setIsHomeNav($route.name, null)"
                     id="finacialPay-settleState"
                     code="SETTLE_PAY_STATUS"
                     placeholder="请选择单据状态"

+ 11 - 10
src/views/financialManagement/warehousingAudit/list.vue

@@ -21,16 +21,17 @@
               </a-form-item>
             </a-col>
             <a-col :md="4" :sm="24">
-                <a-form-item label="入库审核状态">
-                  <v-select
-                    v-model="queryParam.auditState"
-                    ref="auditState"
-                    id="warehousingAuditList-auditState"
-                    code="RECEIVING_BILL_AUDIT_STATUS"
-                    placeholder="请选择入库审核状态"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
+              <a-form-item label="入库审核状态">
+                <v-select
+                  v-model="queryParam.auditState"
+                  ref="auditState"
+                  @change="setIsHomeNav($route.name, null)"
+                  id="warehousingAuditList-auditState"
+                  code="RECEIVING_BILL_AUDIT_STATUS"
+                  placeholder="请选择入库审核状态"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="warehousingAuditList-refresh">查询</a-button>

+ 1 - 0
src/views/outboundOrderManagement/outboundOrder/list.vue

@@ -27,6 +27,7 @@
                   ref="outBizType"
                   id="outboundOrderList-outBizType"
                   code="OUT_STOCK_TYPE"
+                  @change="setIsHomeNav($route.name, null)"
                   isEnable
                   placeholder="请选择出库类型"
                   allowClear></v-select>

+ 1 - 0
src/views/purchasingManagement/purchaseReturn/list.vue

@@ -20,6 +20,7 @@
                 <v-select
                   v-model="queryParam.state"
                   ref="state"
+                  @change="setIsHomeNav($route.name, null)"
                   id="purchaseReturnList-state"
                   code="PURCHASE_RETURN_STATUS"
                   placeholder="请选择业务状态"

+ 41 - 40
src/views/purchasingManagement/purchaseReturnApplyForm/list.vue

@@ -32,25 +32,26 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
-            
+
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-              <a-form-item label="采购退货申请单号">
-                <a-input id="purchaseReturnList-purchaseReturnApplyNo" v-model.trim="queryParam.purchaseReturnApplyNo" allowClear placeholder="请输入采购退货申请单号"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="业务状态">
-                <v-select
-                  v-model="queryParam.billStatus"
-                  ref="billStatus"
-                  id="purchaseReturnList-billStatus"
-                  code="RETURN_APPLY_BILL_STATUS"
-                  placeholder="请选择业务状态"
-                  allowClear
-                ></v-select>
-              </a-form-item>
-            </a-col>
+                <a-form-item label="采购退货申请单号">
+                  <a-input id="purchaseReturnList-purchaseReturnApplyNo" v-model.trim="queryParam.purchaseReturnApplyNo" allowClear placeholder="请输入采购退货申请单号"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="业务状态">
+                  <v-select
+                    v-model="queryParam.billStatus"
+                    ref="billStatus"
+                    @change="setIsHomeNav($route.name, null)"
+                    id="purchaseReturnList-billStatus"
+                    code="RETURN_APPLY_BILL_STATUS"
+                    placeholder="请选择业务状态"
+                    allowClear
+                  ></v-select>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="客服审核时间">
                   <rangeDate ref="auditDate" :value="auditTime" @change="auditDateChange" />
@@ -135,24 +136,24 @@
       okText="确定"
       @ok="creatReturnOrder"
       @close="closeCreatModal">
-        <div>
-          <div style="padding:10px 0;">供应商:箭冠营销中心</div>
-          <div style='color:#999;'>
-            <div>说明:</div>
-            <div>1、采购退货申请单提交后,箭冠营销中心系统将能查看到此单并进行后续处理。</div>
-            <div>2、采购退货申请单中的产品,不会占用库存。</div>
-          </div>
-          <div style="display:flex;align-items: center;padding-top: 20px;">
-             <span style="color:red;">*</span>
-             <span>退货类别:</span>
-             <v-select
-               style="width:250px;"
-               v-model="goodFlag"
-               code="GOOD_FLAG"
-               placeholder="请选择退货类别"
-               allowClear></v-select>
-          </div>
+      <div>
+        <div style="padding:10px 0;">供应商:箭冠营销中心</div>
+        <div style="color:#999;">
+          <div>说明:</div>
+          <div>1、采购退货申请单提交后,箭冠营销中心系统将能查看到此单并进行后续处理。</div>
+          <div>2、采购退货申请单中的产品,不会占用库存。</div>
+        </div>
+        <div style="display:flex;align-items: center;padding-top: 20px;">
+          <span style="color:red;">*</span>
+          <span>退货类别:</span>
+          <v-select
+            style="width:250px;"
+            v-model="goodFlag"
+            code="GOOD_FLAG"
+            placeholder="请选择退货类别"
+            allowClear></v-select>
         </div>
+      </div>
     </common-modal>
   </a-card>
 </template>
@@ -300,15 +301,15 @@ export default {
         _this.openTipsModal = true
       }
     },
-    closeCreatModal(){
+    closeCreatModal () {
       this.openTipsModal = false
       this.goodFlag = 'DEFECTIVE_PRODUCT_RETURN'
     },
-    creatReturnOrder(){
+    creatReturnOrder () {
       const _this = this
-      if(_this.goodFlag){
+      if (_this.goodFlag) {
         _this.spinning = true
-        purchaseReturnSave({goodFlag: _this.goodFlag}).then(res => {
+        purchaseReturnSave({ goodFlag: _this.goodFlag }).then(res => {
           if (res.status == 200) {
             const data = res.data
             _this.spinning = false
@@ -320,8 +321,8 @@ export default {
             _this.spinning = false
           }
         })
-      }else{
-        this.$message.success("请选择退货类别")
+      } else {
+        this.$message.success('请选择退货类别')
       }
     },
     // 再次编辑

+ 21 - 20
src/views/purchasingManagement/purchaseReturnOutSync/list.vue

@@ -26,27 +26,28 @@
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-              <a-form-item label="是否抓单">
-                <v-select
-                  code="FLAG"
-                  id="purchaseReturnList-grabFlag"
-                  v-model="queryParam.grabFlag"
-                  allowClear
-                  placeholder="请选择是否抓单"></v-select>
-              </a-form-item>
-            </a-col>
+                <a-form-item label="是否抓单">
+                  <v-select
+                    code="FLAG"
+                    id="purchaseReturnList-grabFlag"
+                    v-model="queryParam.grabFlag"
+                    allowClear
+                    placeholder="请选择是否抓单"></v-select>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
-              <a-form-item label="业务状态">
-                <v-select
-                  v-model="queryParam.state"
-                  ref="state"
-                  id="purchaseReturnList-state"
-                  code="PURCHASE_RETURN_NO_SYNC_STATUS"
-                  placeholder="请选择业务状态"
-                  allowClear
-                ></v-select>
-              </a-form-item>
-            </a-col>
+                <a-form-item label="业务状态">
+                  <v-select
+                    v-model="queryParam.state"
+                    ref="state"
+                    id="purchaseReturnList-state"
+                    @change="setIsHomeNav($route.name, null)"
+                    code="PURCHASE_RETURN_NO_SYNC_STATUS"
+                    placeholder="请选择业务状态"
+                    allowClear
+                  ></v-select>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="财务状态">
                   <v-select

+ 1 - 0
src/views/salesManagement/salesQuery/list.vue

@@ -58,6 +58,7 @@
                 <a-form-item label="业务状态">
                   <v-select
                     v-model="queryParam.billStatus"
+                    @change="setIsHomeNav($route.name, null)"
                     ref="billStatus"
                     id="salesManagementList-billStatus"
                     code="SALES_BILL_STATUS"

+ 1 - 0
src/views/salesManagement/salesReturn/list.vue

@@ -30,6 +30,7 @@
                 <a-form-item label="业务状态">
                   <v-select
                     v-model="queryParam.state"
+                    @change="setIsHomeNav($route.name, null)"
                     ref="state"
                     id="salesManagementList-state"
                     code="SALES_RETURN_BILL_STATUS"