Browse Source

修改bug

chenrui 2 years ago
parent
commit
30156afbe4

+ 13 - 3
src/views/salesReturnManagement/billOfLading/add.vue

@@ -87,6 +87,11 @@
                 />
               </a-form-model-item>
             </a-col>
+            <a-col :md="24">
+              <a-form-model-item label="出库仓库" :label-col="{span:2}" :wrapper-col="{span:20}">
+                <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+              </a-form-model-item>
+            </a-col>
             <a-col :span="24">
               <a-form-model-item label="运费" :label-col="{span:2}" :wrapper-col="{span:20}">
                 <a-input
@@ -196,11 +201,12 @@ import employee from '../../expenseManagement/expenseReimbursement/employee.js'
 import logisticsCompany from './logisticsCompany.js'
 import logisticsPoint from './logisticsPoint'
 import chooseDepartUserModal from '../../expenseManagement/expenseReimbursement/chooseDepartUserModal.vue'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 export default {
   name: 'ProductInfoEdit',
   mixins: [commonMixin],
-  components: { VSelect, Upload, STable, employee, dealerSubareaScopeList, chooseDepartUserModal, selectXtModal, logisticsCompany, logisticsPoint },
+  components: { VSelect, Upload, STable, employee, dealerSubareaScopeList, chooseDepartUserModal, selectXtModal, logisticsCompany, logisticsPoint, chooseWarehouse },
   data () {
     return {
       spinning: false,
@@ -249,6 +255,10 @@ export default {
     }
   },
   methods: {
+    // 选择出库仓库
+    handleWarehouse (val) {
+
+    },
     custChange (val) {
       this.form.senderSn = val.key
       this.form.senderName = val.name
@@ -262,8 +272,8 @@ export default {
     openSelModal () {
       this.showXtModal = true
     },
-    closeModal(){
-      this.openDepartUserModal=false
+    closeModal () {
+      this.openDepartUserModal = false
       this.showXtModal = false
       this.spinning = false
     },

+ 15 - 4
src/views/salesReturnManagement/pickUp/list.vue

@@ -48,16 +48,21 @@
                   ></v-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="出库仓库">
+                  <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+                </a-form-model-item>
+              </a-col>
             </template>
-            <a-col :md="6" :sm="24">
-              <span class="table-page-search-submitButtons">
+            <a-col :md="24" :sm="24">
+              <div class="table-page-search-submitButtons" style="text-align:center;">
                 <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">
                   {{ advanced ? '收起' : '展开' }}
                   <a-icon :type="advanced ? 'up' : 'down'"/>
                 </a>
-              </span>
+              </div>
             </a-col>
           </a-row>
         </a-form>
@@ -115,6 +120,7 @@ import custList from '@/views/common/custList.vue'
 import employee from '../../expenseManagement/expenseReimbursement/employee.js'
 import logisticsPoint from '../billOfLading/logisticsPoint'
 import rangeDate from '@/views/common/rangeDate.vue'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import { pickUpQueryPage, pickUpFinish } from '@/api/pickUp'
 export default {
   name: 'PickUpList',
@@ -125,7 +131,8 @@ export default {
     custList,
     employee,
     rangeDate,
-    logisticsPoint
+    logisticsPoint,
+    chooseWarehouse
   },
   data () {
     return {
@@ -183,12 +190,16 @@ export default {
         { title: '发货方', dataIndex: 'dealerEntity.dealerName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收货人', dataIndex: 'receiverName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '状态', dataIndex: 'stateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '出库仓库', dataIndex: 'warehouse', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
       ]
       return arr
     }
   },
   methods: {
+    handleWarehouse (val) {
+
+    },
     //  审核时间  change
     dateExamineChange (date) {
       this.queryParam.auditBeginDate = date[0] ? date[0] : ''

+ 25 - 13
src/views/salesReturnManagement/receiveCheck/list.vue

@@ -10,17 +10,17 @@
                 <rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="总部销退单号">
                 <a-input id="receiveCheck-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="客户名称">
                 <dealerSubareaScopeList ref="dealerSubareaScopeList" id="receiveCheck-buyerSn" @change="custChange" />
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="业务状态">
                 <v-select
                   v-model="queryParam.billStatus"
@@ -32,6 +32,11 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="出库仓库">
+                <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+              </a-form-model-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
@@ -77,12 +82,12 @@
               v-if="record.billStatus == 'WAIT_CHECK'&&$hasPermissions('B_salesReturnCheck')"
               @click="handleCheck(record)"
               id="salesReturn-eexamine-btn">品检</a-button>
-              <a-button
-                size="small"
-                type="link"
-                class="button-warning"
-                @click="handleOpenPrintModal(record)"
-                id="salesReturn-print-btn">打印</a-button>
+            <a-button
+              size="small"
+              type="link"
+              class="button-warning"
+              @click="handleOpenPrintModal(record)"
+              id="salesReturn-print-btn">打印</a-button>
           </div>
         </template>
       </s-table>
@@ -107,6 +112,7 @@ import employee from '../../expenseManagement/expenseReimbursement/employee.js'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { salesReturnList } from '@/api/salesReturn'
 import printModal from './printModal.vue'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import commonModal from '@/views/common/commonModal.vue'
 export default {
   name: 'ReceiveCheckList',
@@ -118,7 +124,8 @@ export default {
     employee,
     rangeDate,
     printModal,
-    commonModal
+    commonModal,
+    chooseWarehouse
   },
   data () {
     return {
@@ -159,7 +166,7 @@ export default {
       visibleAudit: false,
       auditInfo: null,
       spinningAudit: false,
-      showTipModal:false
+      showTipModal: false
     }
   },
   computed: {
@@ -169,6 +176,7 @@ export default {
         { title: '审核时间', dataIndex: 'auditTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '总部销退单号', scopedSlots: { customRender: 'salesReturnBillNo' }, width: '10%', align: 'center' },
         { title: '客户名称', dataIndex: 'buyerName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '出库仓库', dataIndex: 'warehouse', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '申请退货数量', dataIndex: 'totalInitialQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '仓库实收数量', dataIndex: 'totalReceiveQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '坏件数量', dataIndex: 'totalBadQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -181,6 +189,10 @@ export default {
     }
   },
   methods: {
+    // 选择出库仓库
+    handleWarehouse (val) {
+
+    },
     //  审核时间  change
     dateExamineChange (date) {
       this.queryParam.beginAuditDate = date[0]
@@ -225,8 +237,8 @@ export default {
       this.showTipModal = false
       this.$refs.printModel.handleCommonCancel()
     },
-    handleOpenPrintModal(row){
-      this.showTipModal=true
+    handleOpenPrintModal (row) {
+      this.showTipModal = true
       this.$nextTick(() => {
         this.$refs.printModel.getData(row)
       })

+ 13 - 1
src/views/salesReturnManagement/salesReturn/chooseCustomModal.vue

@@ -50,6 +50,13 @@
             </a-form-model-item>
           </a-col>
         </a-row>
+        <a-row :gutter="15">
+          <a-col :span="20">
+            <a-form-model-item label="退货仓库" prop="warehouse">
+              <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+            </a-form-model-item>
+          </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>
@@ -64,10 +71,11 @@ import { commonMixin } from '@/utils/mixin'
 import { VSelect } from '@/components'
 import { dealerSubareaScopeList, dealerDetailBySn } from '@/api/dealer'
 import { salesReturnInsert } from '@/api/salesReturn'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 export default {
   name: 'SalesReturnChooseCustomModal',
   mixins: [commonMixin],
-  components: { VSelect },
+  components: { VSelect, chooseWarehouse },
   props: {
     show: [Boolean]
   },
@@ -105,6 +113,10 @@ export default {
     }
   },
   methods: {
+    // 选择退货仓库
+    handleWarehouse (val) {
+
+    },
     // 搜索经销商
     fetchUser (value) {
       console.log('fetching user', value)

+ 13 - 1
src/views/salesReturnManagement/salesReturn/list.vue

@@ -74,6 +74,11 @@
                     <Area id="salesReturn-provinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
                   </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="退货仓库">
+                  <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+                </a-form-model-item>
+              </a-col>
             </template>
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
@@ -206,6 +211,7 @@ import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import verifyModal from './verifyModal.vue'
 import chooseDepartUserModal from './chooseDepartUserModal.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import { salesReturnList, salesReturnQueryCount, salesReturnDel, salesReturnSubmit } from '@/api/salesReturn'
 import moment from 'moment'
 import getDate from '@/libs/getDate.js'
@@ -221,7 +227,8 @@ export default {
     verifyModal,
     chooseDepartUserModal,
     Area,
-    subarea
+    subarea,
+    chooseWarehouse
   },
   data () {
     return {
@@ -291,6 +298,7 @@ export default {
         { title: '客户采退申请单号', dataIndex: 'purchaseReturnApplyNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '总部销退单号', scopedSlots: { customRender: 'salesReturnBillNo' }, width: '10%', align: 'center' },
         { title: '客户名称', dataIndex: 'buyerName', width: '9%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '退货仓库', dataIndex: 'warehouse', width: '9%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '申请退货数量', dataIndex: 'totalInitialQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '仓库实收数量', dataIndex: 'totalReceiveQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '坏件数量', dataIndex: 'totalBadQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -307,6 +315,10 @@ export default {
     }
   },
   methods: {
+    // 选择退货仓库
+    handleWarehouse (val) {
+    
+    },
     getCount (params) {
       salesReturnQueryCount(params).then(res => {
         this.countData = res.data