浏览代码

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

chenrui 1 年之前
父节点
当前提交
952c044492
共有 29 个文件被更改,包括 76 次插入76 次删除
  1. 1 1
      public/version.json
  2. 2 2
      src/views/common/commonModal.vue
  3. 2 2
      src/views/financialManagement/companyCollectionPayment/detail.vue
  4. 2 2
      src/views/financialManagement/companyReceivablePayable/collectionPayment.vue
  5. 2 2
      src/views/financialManagement/companyReceivablePayable/detail.vue
  6. 2 2
      src/views/financialManagement/companyReceivablePayableNew/collectionPayment.vue
  7. 2 2
      src/views/financialManagement/companyReceivablePayableNew/detail.vue
  8. 3 5
      src/views/financialManagement/expenseManagement/list.vue
  9. 2 2
      src/views/financialManagement/fundAccountManagement/addModal.vue
  10. 5 7
      src/views/financialManagement/warehousingAudit/list.vue
  11. 8 9
      src/views/numsGoodsShelves/customerAnalysis/list.vue
  12. 2 2
      src/views/numsGoodsShelves/recallManagement/basicInfoModal.vue
  13. 2 2
      src/views/numsGoodsShelves/recallManagement/list.vue
  14. 4 6
      src/views/numsGoodsShelves/replenishmentManagement/creatReplenishmentOrder.vue
  15. 4 4
      src/views/numsGoodsShelves/settlementManagement/list.vue
  16. 2 1
      src/views/numsGoodsShelves/shelfOrder/detail.vue
  17. 2 2
      src/views/purchasingManagement/purchaseOrder/basicInfoModal.vue
  18. 3 1
      src/views/purchasingManagement/purchaseOrder/list.vue
  19. 3 2
      src/views/purchasingManagement/purchaseReturnApplyForm/detail.vue
  20. 4 3
      src/views/purchasingManagement/purchaseReturnApplyForm/edit.vue
  21. 3 2
      src/views/purchasingManagement/purchaseReturnApplyForm/list.vue
  22. 3 3
      src/views/purchasingManagement/purchaseReturnOutSync/basicInfoModal.vue
  23. 2 1
      src/views/purchasingManagement/purchaseReturnOutSync/detail.vue
  24. 2 1
      src/views/purchasingManagement/purchaseReturnOutSync/edit.vue
  25. 2 1
      src/views/purchasingManagement/purchaseReturnOutSync/grapEdit.vue
  26. 3 3
      src/views/purchasingManagement/purchaseReturnOutSync/list.vue
  27. 2 2
      src/views/salesManagement/salesReturn/chooseCustomModal.vue
  28. 1 3
      src/views/salesManagement/salesman/editModal.vue
  29. 1 1
      src/views/salesManagement/urgentItemsOffset/detail.vue

+ 1 - 1
public/version.json

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

+ 2 - 2
src/views/common/commonModal.vue

@@ -13,8 +13,8 @@
       <div class="common-main" v-html="modalHtml"></div>
       <slot></slot>
       <div class="btn-box">
-        <a-button type="default" class="button-warning" @click="handleCommonCancel" v-if="isCancel">{{ cancelText }}</a-button>
-        <a-button type="primary" class="button-info" @click="handleCommonOk">{{ okText }}</a-button>
+        <a-button type="default" size="large" class="button-warning" @click="handleCommonCancel" v-if="isCancel">{{ cancelText }}</a-button>
+        <a-button type="primary" size="large" class="button-error" @click="handleCommonOk">{{ okText }}</a-button>
       </div>
     </a-spin>
   </a-modal>

+ 2 - 2
src/views/financialManagement/companyCollectionPayment/detail.vue

@@ -5,7 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="companyCollectionPaymentDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <p style=" display: inline-block;margin: 0 0 0 60px;color: #000;font-size: 16px;font-weight: 600;">单号:{{ (basicInfoData&&basicInfoData.unitSettleNo) || '--' }}</p>
+          <p style=" display: inline-block;margin: 0 0 0 20px;color: #000;font-size: 14px;font-weight: 600;">单号:{{ (basicInfoData&&basicInfoData.unitSettleNo) || '--' }}</p>
         </template>
       </a-page-header>
       <!-- 基础信息 -->
@@ -141,6 +141,6 @@ export default {
 
 <style lang="less">
   .companyCollectionPaymentDetail-cont{
-    margin-bottom: 10px;
+    margin-bottom: 6px;
   }
 </style>

+ 2 - 2
src/views/financialManagement/companyReceivablePayable/collectionPayment.vue

@@ -5,7 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="collectionPayment-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <p style=" display: inline-block;margin: 0 0 0 60px;color: #000;font-size: 16px;font-weight: 600;">客户:{{ $route.params.name!='undefined'?$route.params.name: '--' }}</p>
+          <p style=" display: inline-block;margin: 0 0 0 30px;color: #000;font-size: 14px;font-weight: 600;">客户:{{ $route.params.name!='undefined'?$route.params.name: '--' }}</p>
         </template>
         <template slot="extra" v-if="$hasPermissions('B_cPayment_printAndExport')">
           <Print :disabled="chooseLoadData.length==0||totalBalance==0" @handlePrint="handlePrint"></Print>
@@ -474,7 +474,7 @@ export default {
       height: 100%;
     }
     .collectionPayment-cont{
-      margin-top: 10px;
+      margin-top: 6px;
       .green{
         color: #19be6b;
       }

+ 2 - 2
src/views/financialManagement/companyReceivablePayable/detail.vue

@@ -5,7 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="companyCollectionPaymentDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <p style=" display: inline-block;margin: 0 0 0 60px;color: #000;font-size: 16px;font-weight: 600;">客户:{{ $route.params.name!='undefined'?$route.params.name: '--' }}</p>
+          <p style=" display: inline-block;margin: 0 0 0 30px;color: #000;font-size: 14px;font-weight: 600;">客户:{{ $route.params.name!='undefined'?$route.params.name: '--' }}</p>
         </template>
       </a-page-header>
       <a-card>
@@ -185,6 +185,6 @@ export default {
 
 <style lang="less">
   .companyCollectionPaymentDetail-cont{
-    margin-bottom: 10px;
+    margin-bottom: 6px;
   }
 </style>

+ 2 - 2
src/views/financialManagement/companyReceivablePayableNew/collectionPayment.vue

@@ -4,7 +4,7 @@
       <a-page-header :ghost="false" :backIcon="false" class="collectionPayment-back" >
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
-          <span style="margin-right:30px;color: #000;font-size: 16px;font-weight: 600;">客户:{{ $route.params.name!='undefined'?$route.params.name: '--' }}</span>
+          <span style="margin-right:30px;color: #000;font-size: 14px;font-weight: 600;">客户:{{ $route.params.name!='undefined'?$route.params.name: '--' }}</span>
           <a-button id="purchaseNewOrderEdit-back-btn" type="link" @click="handleBack" class="button-default"> <a-icon type="rollback" /> 返回列表</a-button>
         </template>
         <template slot="extra" v-if="$hasPermissions('B_cPayment_printAndExport')">
@@ -494,7 +494,7 @@ export default {
       height: 100%;
     }
     .collectionPayment-cont{
-      margin-top: 10px;
+      margin-top: 6px;
       .green{
         color: #19be6b;
       }

+ 2 - 2
src/views/financialManagement/companyReceivablePayableNew/detail.vue

@@ -4,7 +4,7 @@
       <a-page-header :ghost="false" :backIcon="false" class="companyCollectionPaymentDetail-cont" >
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
-          <span style="margin-right: 30px;color: #000;font-size: 16px;font-weight: 600;">客户:{{ $route.params.name!='undefined'?$route.params.name: '--' }}</span>
+          <span style="margin-right: 30px;color: #000;font-size: 14px;font-weight: 600;">客户:{{ $route.params.name!='undefined'?$route.params.name: '--' }}</span>
           <a-button id="companyCollectionPaymentDetail-back-btn" type="link" @click="handleBack" class="button-default"> <a-icon type="rollback" /> 返回列表</a-button>
         </template>
       </a-page-header>
@@ -187,6 +187,6 @@ export default {
 
 <style lang="less">
   .companyCollectionPaymentDetail-cont{
-    margin-bottom: 10px;
+    margin-bottom: 6px;
   }
 </style>

+ 3 - 5
src/views/financialManagement/expenseManagement/list.vue

@@ -29,8 +29,7 @@
                   allowClear />
               </a-form-item>
             </a-col>
-            <template v-if="advanced">
-              <a-col :md="4" :sm="24">
+            <a-col :md="4" :sm="24">
                 <a-form-item label="单据状态">
                   <v-select
                     v-model="queryParam.state"
@@ -41,15 +40,14 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
-            </template>
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="expenseManagementList-refresh">查询</a-button>
                 <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="expenseManagementList-reset">重置</a-button>
-                <a @click="advanced=!advanced" style="margin-left: 8px">
+                <!-- <a @click="advanced=!advanced" style="margin-left: 8px">
                   {{ advanced ? '收起' : '展开' }}
                   <a-icon :type="advanced ? 'up' : 'down'"/>
-                </a>
+                </a> -->
               </span>
             </a-col>
           </a-row>

+ 2 - 2
src/views/financialManagement/fundAccountManagement/addModal.vue

@@ -43,8 +43,8 @@
             allowClear />
         </a-form-model-item>
         <a-form-model-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;">
-          <a-button type="primary" :loading="confirmLoading" @click="handleSubmit" id="chooseCustom-btn-submit">保存</a-button>
-          <a-button @click="isShow=false" style="margin-left: 15px" id="chooseCustom-btn-back">取消</a-button>
+          <a-button type="primary" size="large" :loading="confirmLoading" @click="handleSubmit" id="chooseCustom-btn-submit">保存</a-button>
+          <a-button @click="isShow=false" size="large" style="margin-left: 15px" id="chooseCustom-btn-back">取消</a-button>
         </a-form-model-item>
       </a-form-model>
     </a-spin>

+ 5 - 7
src/views/financialManagement/warehousingAudit/list.vue

@@ -5,12 +5,12 @@
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-item label="采购单号">
                 <a-input id="warehousingAuditList-purchaseBillNo" v-model.trim="queryParam.purchaseBillNo" allowClear placeholder="请输入采购单号"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-item label="发货单号">
                 <a-input id="warehousingAuditList-receivingBillNo" v-model.trim="queryParam.receivingBillNo" allowClear placeholder="请输入发货单号"/>
               </a-form-item>
@@ -20,8 +20,7 @@
                 <rangeDate ref="rangeDate" :value="auditTime" @change="dateChange" />
               </a-form-item>
             </a-col>
-            <template v-if="advanced">
-              <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24">
                 <a-form-item label="入库审核状态">
                   <v-select
                     v-model="queryParam.auditState"
@@ -32,15 +31,14 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
-            </template>
             <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>
                 <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="warehousingAuditList-reset">重置</a-button>
-                <a @click="advanced=!advanced" style="margin-left: 8px">
+                <!-- <a @click="advanced=!advanced" style="margin-left: 8px">
                   {{ advanced ? '收起' : '展开' }}
                   <a-icon :type="advanced ? 'up' : 'down'"/>
-                </a>
+                </a> -->
               </span>
             </a-col>
           </a-row>

+ 8 - 9
src/views/numsGoodsShelves/customerAnalysis/list.vue

@@ -4,17 +4,17 @@
       <a-spin :spinning="spinning" tip="Loading...">
         <div ref="tableSearch" class="table-page-search-wrapper">
           <a-form-model layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-            <a-row :gutter="15">
+            <a-row :gutter="10">
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="货架名称" prop="shelfSn">
-                  <shelfSList v-model="queryParam.shelfSn"></shelfSList>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="8" :sm="24">
                 <a-form-item label="下单时间">
-                  <rangeDate ref="orderDate" :value="orderTime" @change="orderDateChange" />
+                  <rangeDate style="width: 100%;" ref="orderDate" :value="orderTime" @change="orderDateChange" />
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="货架名称" prop="shelfSn">
+                  <shelfSList style="width: 100%;" v-model="queryParam.shelfSn"></shelfSList>
+                </a-form-model-item>
+              </a-col>
               <!-- <a-col :md="6" :sm="24">
                 <a-form-item label="货架取货数量">
                   <a-input-group compact>
@@ -65,7 +65,7 @@
                   </a-form-item>
                 </a-col>
               </template> -->
-              <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+              <a-col :md="8" :sm="24" style="margin-bottom: 10px;">
                 <a-button type="primary" @click="$refs.table.refresh(true)" id="userd-refresh">查询</a-button>
                 <a-button type="" @click="reset" style="margin-left: 10px;" id="userd-reset">重置</a-button>
                 <a-button
@@ -81,7 +81,6 @@
                 </a> -->
               </a-col>
             </a-row>
-            </a-form>
           </a-form-model></div>
         <div class="table-operator" v-if="statisticsObj">
           <a-alert type="info">

+ 2 - 2
src/views/numsGoodsShelves/recallManagement/basicInfoModal.vue

@@ -21,8 +21,8 @@
         </a-form-model-item>
       </a-form-model>
       <div class="btn-cont">
-        <a-button type="primary" id="importGuide-nextStep" @click="handlerNextStep">下一步</a-button>
-        <a-button id="shelfSet-basicInfo-modal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
+        <a-button size="large" type="primary" id="importGuide-nextStep" @click="handlerNextStep">下一步</a-button>
+        <a-button size="large" id="shelfSet-basicInfo-modal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
       </div>
     </a-spin>
     <!-- 新增回调单(实现新增) -->

+ 2 - 2
src/views/numsGoodsShelves/recallManagement/list.vue

@@ -9,7 +9,7 @@
           </a-tab-pane>
         </a-tabs>
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row :gutter="36">
+          <a-row :gutter="10">
             <a-col :md="6" :sm="24">
               <a-form-item label="创建时间">
                 <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
@@ -22,7 +22,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="货架名称">
-                <shelfList :showAll="true" v-model="queryParam.shelfSn"></shelfList>
+                <shelfList style="width: 100%;" :showAll="true" v-model="queryParam.shelfSn"></shelfList>
               </a-form-item>
             </a-col>
             <template v-if="advanced">

+ 4 - 6
src/views/numsGoodsShelves/replenishmentManagement/creatReplenishmentOrder.vue

@@ -7,7 +7,7 @@
     :title="modalTit"
     v-model="isShow"
     @cancel="isShow = false"
-    width="80%">
+    width="70%">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper">
@@ -28,15 +28,13 @@
                 <a-input id="chooseShelf-name" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="10" :sm="24">
+            <a-col :md="12" :sm="24">
               <a-form-model-item label="门店库存情况">
                 <a-checkbox-group :options="options" v-model="queryParam.stockStateList" @change="onStockChange" />
+                <a-button style="margin-left: 15px" type="primary" @click="$refs.table.refresh(true)" id="chooseShelf-refresh">查询</a-button>
+                <a-button style="margin-left: 5px" @click="resetSearchForm" id="chooseShelf-reset">重置</a-button>
               </a-form-model-item>
             </a-col>
-            <a-col :md="24" :sm="24" style="margin-bottom: 10px;text-align:right;">
-              <a-button type="primary" @click="$refs.table.refresh(true)" id="chooseShelf-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" id="chooseShelf-reset">重置</a-button>
-            </a-col>
           </a-row>
         </a-form-model>
       </div>

+ 4 - 4
src/views/numsGoodsShelves/settlementManagement/list.vue

@@ -4,7 +4,7 @@
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row type="flex" :gutter="15">
+          <a-row type="flex" :gutter="10">
             <a-col flex="350px">
               <a-form-item label="货架名称">
                 <shelfList style="max-width:300px;" v-model="queryParam.shelfSn"></shelfList>
@@ -15,7 +15,7 @@
                 <custList ref="custList" :dealerFlag="0" @change="custChange" v-model="queryParam.customerName"></custList>
               </a-form-item>
             </a-col>
-            <a-col flex="200px">
+            <a-col flex="300px">
               <a-form-item label="结算方式">
                 <v-select code="SHELF_SETTLE_TYPE" v-model="queryParam.settleType" allowClear placeholder="请选择状态"></v-select>
               </a-form-item>
@@ -52,10 +52,10 @@
             <a-col flex="200px">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="outboundOrderList-refresh" >查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="outboundOrderList-reset">重置</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 5px">
+              <!-- <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
-              </a>
+              </a> -->
             </a-col>
           </a-row>
         </a-form>

+ 2 - 1
src/views/numsGoodsShelves/shelfOrder/detail.vue

@@ -4,6 +4,7 @@
       <a-page-header :ghost="false" :backIcon="false" class="shelfOrderDetail-cont" :style="{ padding: !outBizSn ? '16px 24px' : '0px 24px' }">
         <template slot="subTitle" v-if="!outBizSn">
           <a href="javascript:;" @click="handleBack"><a-icon type="left"></a-icon> 返回列表</a>
+          <a style="margin: 0 10px 0 20px;color: #666;font-size: 14px;font-weight: 600;">订单号:{{ detailData&&detailData.orderBillNo || '--' }}</a>
         </template>
       </a-page-header>
       <!-- 基础信息 -->
@@ -130,7 +131,7 @@ export default {
 <style lang="less">
   .shelfOrderDetail-wrap{
     .shelfOrderDetail-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
   }
 </style>

+ 2 - 2
src/views/purchasingManagement/purchaseOrder/basicInfoModal.vue

@@ -41,8 +41,8 @@
           <a-button type="link" id="purchaseOrder-basicInfo-chooseAddr" @click="handleChoose">{{ addressVal }} >></a-button>
         </a-form-model-item>
         <a-form-model-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;">
-          <a-button type="primary" :loading="confirmLoading" @click="handleSubmit" id="chooseCustom-btn-submit">保存</a-button>
-          <a-button @click="isShow=false" style="margin-left: 15px" id="chooseCustom-btn-back">取消</a-button>
+          <a-button size="large" type="primary" :loading="confirmLoading" @click="handleSubmit" id="chooseCustom-btn-submit">保存</a-button>
+          <a-button size="large" @click="isShow=false" style="margin-left: 15px" id="chooseCustom-btn-back">取消</a-button>
         </a-form-model-item>
       </a-form-model>
     </a-spin>

+ 3 - 1
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -16,7 +16,7 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="供应商" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+              <a-form-item label="供应商">
                 <a-select
                   id="purchaseOrderList-purchaseTargetSn"
                   placeholder="请选择供应商"
@@ -42,6 +42,7 @@
             <a-col :md="6" :sm="24" v-show="advanced">
               <a-form-item label="财务状态">
                 <v-select
+                style="width: 100%;"
                   v-model="queryParam.financialStatus"
                   ref="financialStatus"
                   id="purchaseOrderList-financialStatus"
@@ -53,6 +54,7 @@
             <a-col :md="6" :sm="24" v-show="advanced">
               <a-form-item label="单据来源">
                 <v-select
+                style="width: 100%;"
                   v-model="queryParam.purchaseBillSource"
                   ref="purchaseBillSource"
                   id="purchaseOrderList-purchaseBillSource"

+ 3 - 2
src/views/purchasingManagement/purchaseReturnApplyForm/detail.vue

@@ -5,7 +5,8 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle" v-if="!outBizSn">
           <a id="purchaseReturnDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <span style="margin: 0 15px;color: #666;">供应商名称:箭冠营销中心</span>
+          <span class="billno" style="margin: 0 10px;color: #666;">单号:{{ basicInfoData&&basicInfoData.purchaseReturnApplyNo }}</span>
+          <span style="margin: 0 10px;color: #666;">供应商名称:箭冠营销中心</span>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra" v-if="$hasPermissions('B_purchaseReturnApplyPrint')">
@@ -189,7 +190,7 @@ export default {
 
 <style lang="less">
   .purchaseReturnDetail-cont{
-    margin-bottom: 10px;
+    margin-bottom: 6px;
     .timeline-box{
       margin-top: 30px;
       .auxiliary-txt{

+ 4 - 3
src/views/purchasingManagement/purchaseReturnApplyForm/edit.vue

@@ -5,8 +5,9 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="purchaseReturnEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <span style="margin: 0 15px;color: #666;">供应商名称:箭冠营销中心</span>
-          <span style="margin: 0 15px;color: #666;">退货类别:{{ detailData&&detailData.goodFlagDictValue||'--' }}</span>
+          <span class="billno" style="margin: 0 10px;color: #666;">单号:{{ detailData&&detailData.purchaseReturnApplyNo }}</span>
+          <span style="margin: 0 10px;color: #666;">供应商名称:箭冠营销中心</span>
+          <span style="margin: 0 10px;color: #666;">退货类别:{{ detailData&&detailData.goodFlagDictValue||'--' }}</span>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra" v-if="$hasPermissions('B_purchaseReturnApplyPrint')">
@@ -654,7 +655,7 @@ export default {
       height: 100%;
     }
     .purchaseReturnEdit-back, .purchaseReturnEdit-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
   }
 </style>

+ 3 - 2
src/views/purchasingManagement/purchaseReturnApplyForm/list.vue

@@ -32,7 +32,9 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            
+            <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>
@@ -49,7 +51,6 @@
                 ></v-select>
               </a-form-item>
             </a-col>
-            <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-item label="客服审核时间">
                   <rangeDate ref="auditDate" :value="auditTime" @change="auditDateChange" />

+ 3 - 3
src/views/purchasingManagement/purchaseReturnOutSync/basicInfoModal.vue

@@ -7,7 +7,7 @@
     title="新增采购退货单"
     v-model="isShow"
     @cancel="isShow=false"
-    :width="800">
+    :width="600">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-form-model
         id="purchaseOrder-basicInfo-form"
@@ -38,8 +38,8 @@
             placeholder="请选择"></v-select>
         </a-form-model-item>
         <a-form-model-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;">
-          <a-button type="primary" :loading="confirmLoading" @click="handleSubmit" id="chooseCustom-btn-submit">保存</a-button>
-          <a-button @click="isShow=false" style="margin-left: 15px" id="chooseCustom-btn-back">取消</a-button>
+          <a-button type="primary" size="large" :loading="confirmLoading" @click="handleSubmit" id="chooseCustom-btn-submit">保存</a-button>
+          <a-button @click="isShow=false" size="large" style="margin-left: 15px" id="chooseCustom-btn-back">取消</a-button>
         </a-form-model-item>
       </a-form-model>
     </a-spin>

+ 2 - 1
src/views/purchasingManagement/purchaseReturnOutSync/detail.vue

@@ -5,6 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle" v-if="!outBizSn">
           <a id="purchaseReturnDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <a style="margin: 0 10px 0 20px;color: #666;font-size: 14px;font-weight: 600;">单号:{{ basicInfoData&&basicInfoData.purchaseReturnNo || '--' }}</a>
           <a-button
             v-if="isEdit"
             type="primary"
@@ -190,7 +191,7 @@ export default {
 
 <style lang="less">
   .purchaseReturnDetail-cont{
-    margin-bottom: 10px;
+    margin-bottom: 6px;
     .timeline-box{
       margin-top: 30px;
       .auxiliary-txt{

+ 2 - 1
src/views/purchasingManagement/purchaseReturnOutSync/edit.vue

@@ -5,6 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="purchaseReturnEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <a style="margin: 0 10px 0 20px;color: #666;font-size: 14px;font-weight: 600;">单号:{{ detailData&&detailData.purchaseReturnNo || '--' }}</a>
           <span style="margin: 0 15px;color: #666;" v-if="detailData">供应商名称:{{ detailData.returnTargetName || '--' }}</span>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
@@ -532,7 +533,7 @@ export default {
       height: 100%;
     }
     .purchaseReturnEdit-back, .purchaseReturnEdit-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
   }
 </style>

+ 2 - 1
src/views/purchasingManagement/purchaseReturnOutSync/grapEdit.vue

@@ -5,6 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="purchaseReturnEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <a style="margin: 0 10px 0 20px;color: #666;font-size: 14px;font-weight: 600;">单号:{{ detailData&&detailData.purchaseReturnNo || '--' }}</a>
           <span style="margin: 0 15px;color: #666;" v-if="detailData">供应商名称:{{ detailData.returnTargetName || '--' }}</span>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
@@ -507,7 +508,7 @@ export default {
       height: 100%;
     }
     .purchaseReturnEdit-back, .purchaseReturnEdit-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
   }
 </style>

+ 3 - 3
src/views/purchasingManagement/purchaseReturnOutSync/list.vue

@@ -24,7 +24,8 @@
                 </a-select>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
               <a-form-item label="是否抓单">
                 <v-select
                   code="FLAG"
@@ -34,7 +35,7 @@
                   placeholder="请选择是否抓单"></v-select>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+              <a-col :md="6" :sm="24">
               <a-form-item label="业务状态">
                 <v-select
                   v-model="queryParam.state"
@@ -46,7 +47,6 @@
                 ></v-select>
               </a-form-item>
             </a-col>
-            <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-item label="财务状态">
                   <v-select

+ 2 - 2
src/views/salesManagement/salesReturn/chooseCustomModal.vue

@@ -129,8 +129,8 @@
           </a-col>
         </a-row>
         <a-form-model-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;">
-          <a-button type="primary" :loading="confirmLoading" @click="handleSubmit" id="chooseCustom-btn-submit">保存</a-button>
-          <a-button @click="cancel" style="margin-left: 15px" id="chooseCustom-btn-back">取消</a-button>
+          <a-button type="primary" size="large" :loading="confirmLoading" @click="handleSubmit" id="chooseCustom-btn-submit">保存</a-button>
+          <a-button @click="cancel" size="large" style="margin-left: 15px" id="chooseCustom-btn-back">取消</a-button>
         </a-form-model-item>
       </a-form-model>
       <!-- 新增客户 -->

+ 1 - 3
src/views/salesManagement/salesman/editModal.vue

@@ -215,9 +215,6 @@ export default {
         idCard: '', // 身份证号
         entryDate: undefined // 入职时间
       }
-      // this.$nextTick(() => {
-      //   this.$refs.ruleForm.resetFields()
-      // })
     }
   },
   watch: {
@@ -229,6 +226,7 @@ export default {
     //  重定义的弹框状态
     isShow (newValue, oldValue) {
       if (!newValue) {
+        this.$refs.ruleForm.resetFields()
         this.$emit('close')
       }
     },

+ 1 - 1
src/views/salesManagement/urgentItemsOffset/detail.vue

@@ -6,7 +6,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle" v-if="!outBizSn">
           <a id="urgentItemsOffsetDetail-btn-back" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <a style="margin: 0 10px 0 20px;color: #666;font-size: 14px;font-weight: 600;">急件单号:{{ detailData&&detailData.urgentBillNo || '--' }}</a>
+          <a style="margin: 0 10px 0 20px;color: #666;font-size: 14px;font-weight: 600;">单号:{{ detailData&&detailData.urgentBillNo || '--' }}</a>
         </template>
       </a-page-header>
       <!-- 急件单信息 -->