Browse Source

Merge branch 'develop_yh22' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh22

chenrui 1 năm trước cách đây
mục cha
commit
d93d855b63

+ 3 - 3
src/views/common/chooseWarehouse.js

@@ -59,7 +59,7 @@ const warehouse = {
   mounted () {
     if (this.isPermission) {
       this.$store.state.app.defWarehouse = null
-      this.$store.state.app.isWarehouse = false
+      this.$store.state.app.isWarehouse = true
     }
     this.getWarehouse()
   },
@@ -86,7 +86,7 @@ const warehouse = {
         if (res.status == 200) {
           // 有权限控制的
           if (this.isPermission) {
-            this.$store.state.app.isWarehouse = res.data && res.data.length > 1
+            this.$store.state.app.isWarehouse = true
             this.$store.state.app.defWarehouse = res.data && res.data[0]
           }
           this.warehouseData = res.data || []
@@ -102,7 +102,7 @@ const warehouse = {
           }
         } else {
           if (this.isPermission) {
-            this.$store.state.app.isWarehouse = false
+            this.$store.state.app.isWarehouse = true
             this.$store.state.app.defWarehouse = null
           }
           this.warehouseData = []

+ 23 - 23
src/views/reportData/returnSlipReport/list.vue

@@ -33,13 +33,13 @@
                   allowClear></v-select>
               </a-form-model-item>
             </a-col>
-            
+
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-              <a-form-item label="退货单号">
-                <a-input id="returnSlipReportList-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入退货单号"/>
-              </a-form-item>
-            </a-col>
+                <a-form-item label="退货单号">
+                  <a-input id="returnSlipReportList-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入退货单号"/>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
                   <subarea id="returnSlipReportList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
@@ -47,12 +47,12 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="区域负责人">
-                    <BizUser v-model="queryParam.subareaArea.bizUserSn"></BizUser>
+                  <BizUser v-model="queryParam.subareaArea.bizUserSn"></BizUser>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="地区">
-                    <AreaList id="returnSlipReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
+                  <AreaList id="returnSlipReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
                 </a-form-model-item>
               </a-col>
             </template>
@@ -82,7 +82,7 @@
         ref="table"
         size="small"
         :rowKey="(record) => record.no"
-        rowKeyName = 'no'
+        rowKeyName="no"
         :columns="columns"
         :data="loadData"
         :scroll="{ x: tableWidth, y: tableHeight }"
@@ -148,7 +148,7 @@ export default {
         provinceSn: undefined,
         citySn: undefined,
         districtSn: undefined,
-        subareaArea:{
+        subareaArea: {
           subareaSn: undefined,
           subareaAreaSn: undefined,
           bizUserSn: undefined
@@ -190,12 +190,12 @@ export default {
       },
       totalData: null,
       columns: [],
-      countLabel:[],
-      countBrandLabel:[],
+      countLabel: [],
+      countBrandLabel: [],
       tableWidth: 0
     }
   },
-  
+
   methods: {
     //  导出
     handleExport () {
@@ -233,7 +233,7 @@ export default {
         if (valid) {
           _this.$refs.table.refresh(true)
         } else {
-          _this.$message.error("请选择退货日期")
+          _this.$message.error('请选择退货日期')
           return false
         }
       })
@@ -251,7 +251,7 @@ export default {
     custChange (val) {
       this.queryParam.dealerSn = val.key
     },
-    subareaChange(val){
+    subareaChange (val) {
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
@@ -282,34 +282,34 @@ export default {
       this.$refs.ruleForm.resetFields()
       this.$refs.table.clearTable()
     },
-    areaChange(val){
+    areaChange (val) {
       this.queryParam.provinceSn = val[0] ? val[0] : ''
       this.queryParam.citySn = val[1] ? val[1] : ''
       this.queryParam.districtSn = val[2] ? val[2] : ''
     },
     // 获取表头
-    async getTableTitle(){
+    async getTableTitle () {
       const _this = this
       const tableTitle = await salesReportReturnTitle().then(res => res.data)
       this.columns = tableTitle.list
-      this.countLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')<0)
-      this.countBrandLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')>=0)
+      this.countLabel = tableTitle.count.filter(item => item.title.indexOf('品牌') < 0)
+      this.countBrandLabel = tableTitle.count.filter(item => item.title.indexOf('品牌') >= 0)
       this.columns.map(item => {
-        let mw = 40
-        if(item.customRender == 'amount'){
+        let mw = 20
+        if (item.customRender == 'amount') {
           mw = 15
           item.customRender = function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
-        }else{
+        } else {
           item.customRender = function (text) { return text || '--' }
         }
         const w = item.title.length * mw
-        const tw = w <= 80 ? mw*5 : w
+        const tw = w <= 80 ? mw * 5 : w
         item.width = tw + 'px'
         this.tableWidth = this.tableWidth + tw
       })
       this.resetSearchForm()
     },
-    pageInit(){
+    pageInit () {
       this.getTableTitle()
     }
   },

+ 4 - 4
src/views/salesManagement/examineVerify/list.vue

@@ -247,21 +247,21 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单据来源', dataIndex: 'salesBillEntity.salesBillSourceDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单据来源', dataIndex: 'salesBillEntity.salesBillSourceDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '10%', align: 'center' },
         { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '10%', align: 'center' },
         { title: '出库单号', dataIndex: 'stockOutNo', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'buyerName', width: '11%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'buyerName', width: '12%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '数量', dataIndex: 'totalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '售价', dataIndex: 'totalAmount', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '备货时间', dataIndex: 'stockUpDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '业务状态', dataIndex: 'billStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务状态', dataIndex: 'billStatusDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '打印次数', dataIndex: 'stockUpPrintTimes', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
 	  // 仓库管理权限设置是否显示 (当客户有且只有一条仓库管理权限时,不显示仓库信息)
 	  if (this.isShowWarehouse) {
-	    arr.splice(7, 0, { title: '仓库', dataIndex: 'warehouseName', width: '11%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true })
+	    arr.splice(7, 0, { title: '仓库', dataIndex: 'warehouseName', width: '7%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true })
 	  }
       if (this.$hasPermissions('M_examineVerifyList_salesPrice')) { //  售价权限
         arr.splice(this.isShowWarehouse ? 9 : 8, 0, { title: '售价', dataIndex: 'totalAmount', width: '5%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })

+ 4 - 0
src/views/salesManagement/pushOrderManagement/detail.vue

@@ -275,6 +275,10 @@ export default {
         if (obj.orderBy) {
           params.type = params.type + '_STACK_PLACE'
         }
+        // 原厂编码
+        if(obj.origCode == 1){
+          params.type = params.type + '_ORIG_CODE'
+        }
         printFun(
           dispatchDetailPrint,
           Object.assign(params, obj || {}),

+ 9 - 6
src/views/salesManagement/pushOrderManagement/exportExcelModal.vue

@@ -25,10 +25,10 @@
             <a-radio value="DISPATCH_BILL">不导出</a-radio>
           </a-radio-group>
         </a-form-model-item>
-        <a-form-model-item label="原厂编码" prop="priceType" v-if="$hasPermissions('B_dispatchExport_salesPrice')">
-          <a-radio-group v-model="form.priceType">
-            <a-radio value="DISPATCH_BILL_PRICE">导出</a-radio>
-            <a-radio value="DISPATCH_BILL">不导出</a-radio>
+        <a-form-model-item label="原厂编码" prop="origCode">
+          <a-radio-group v-model="form.origCode">
+            <a-radio value="1">导出</a-radio>
+            <a-radio value="0">不导出</a-radio>
           </a-radio-group>
         </a-form-model-item>
       </a-form-model>
@@ -58,10 +58,12 @@ export default {
     return {
       isShow: this.openModal, //  是否打开弹框
       form: {
-        priceType: undefined
+        priceType: undefined,
+        origCode: '0'
       },
       rules: {
-        priceType: [{ required: true, message: '请选择产品售价', trigger: 'change' }]
+        priceType: [{ required: true, message: '请选择产品售价', trigger: 'change' }],
+        origCode: [{ required: true, message: '请选择原厂编码', trigger: 'change' }]
       },
       formItemLayout: {
         labelCol: { span: 6 },
@@ -80,6 +82,7 @@ export default {
           if (!this.$hasPermissions('B_dispatchExport_salesPrice')) {
             _this.form.priceType = 'DISPATCH_BILL'
           }
+          _this.form.priceType += _this.form.origCode == 1 ? '_ORIG_CODE' : ''
           _this.$emit('ok', _this.form.priceType, {}, '下推产品')
           _this.isShow = false
         } else {

+ 2 - 2
src/views/salesManagement/pushOrderManagement/list.vue

@@ -85,7 +85,7 @@
                   <Area id="pushOrder-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
+              <a-col :md="6" :sm="24" v-if="isShowWarehouse">
                 <a-form-model-item label="出库仓库">
                   <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
                 </a-form-model-item>
@@ -280,7 +280,7 @@ export default {
         { title: '发货说明', scopedSlots: { customRender: 'explainInfo' }, width: '150px', align: 'center', ellipsis: true },
         { title: '客户名称', dataIndex: 'buyerName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '收货客户名称', dataIndex: 'receiverName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '出库仓库', dataIndex: 'warehouseName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '出库仓库', dataIndex: 'warehouseName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品款数', dataIndex: 'totalCategory', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '产品数量', dataIndex: 'totalQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '总售价', dataIndex: 'totalAmount', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },

+ 12 - 2
src/views/salesManagement/pushOrderManagement/sendTypeModal.vue

@@ -47,6 +47,12 @@
             <a-radio value="-1">不打印</a-radio>
           </a-radio-group>
         </a-form-model-item>
+        <a-form-model-item label="原厂编码" prop="origCode" v-if="nowType=='print'">
+          <a-radio-group v-model="form.origCode">
+            <a-radio value="1">打印</a-radio>
+            <a-radio value="0">不打印</a-radio>
+          </a-radio-group>
+        </a-form-model-item>
       </a-form-model>
       <div class="btn-cont">
         <a-button id="pushOrderManagement-print-back" @click="handleCancel">取消</a-button>
@@ -100,11 +106,13 @@ export default {
       isShow: this.openModal, //  是否打开弹框
       form: {
         id: 'all',
-        orderBy: undefined
+        orderBy: undefined,
+        origCode: '0'
       },
       rules: {
         id: [{ required: true, message: '请选择产品分类', trigger: 'change' }],
-        orderBy: [{ required: true, message: '请选择货位编号', trigger: 'change' }]
+        orderBy: [{ required: true, message: '请选择货位编号', trigger: 'change' }],
+        origCode: [{ required: true, message: '请选择原厂编码', trigger: 'change' }]
       },
       formItemLayout: {
         labelCol: { span: 6 },
@@ -134,6 +142,7 @@ export default {
             if (_this.form.orderBy != '-1') {
               obj.orderBy = _this.form.orderBy
             }
+            obj.origCode = _this.form.origCode
             _this.$emit('ok', obj, '发货分类', type)
           }
           _this.isShow = false
@@ -149,6 +158,7 @@ export default {
       this.$refs.ruleForm.resetFields()
       this.form.id = 'all'
       this.form.orderBy = undefined
+      this.form.origCode = '0'
     },
     // 获取该销售单产品二级分类
     getTypeData (dispatchBillSn) {

+ 2 - 2
src/views/salesManagement/salesOrderWarehouse/list.vue

@@ -116,7 +116,7 @@ export default {
         beginDate: getDate.getThreeMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
         buyerSn: '', //  客户名称
-        billStatus: undefined, //  业务状态
+        billStatus: 'WAIT_AUDIT', //  业务状态
         salesBillNo: '', // 销售单号
         shippingAddrProvinceSn: undefined,
         warehouseSn: undefined
@@ -205,7 +205,7 @@ export default {
       this.queryParam.beginDate = getDate.getCurrMonthDays().starttime
       this.queryParam.endDate = getDate.getCurrMonthDays().endtime
       this.queryParam.buyerSn = ''
-      this.queryParam.billStatus = undefined
+      this.queryParam.billStatus = 'WAIT_AUDIT'
       this.queryParam.salesBillNo = ''
       this.queryParam.shippingAddrProvinceSn = undefined
       this.queryParam.warehouseSn = undefined

+ 1 - 1
src/views/salesManagement/sendOutOrder/list.vue

@@ -247,7 +247,7 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
       if (this.isShowWarehouse) {
-        arr.splice(7, 0, { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'left', customRender: function (text) { return text || '--' } })
+        arr.splice(7, 0, { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } })
       }
       return arr
     }

+ 4 - 0
src/views/salesManagement/stockPrint/list.vue

@@ -353,6 +353,10 @@ export default {
       if (obj.orderBy) {
         params.type = params.type + '_STACK_PLACE'
       }
+      // 原厂编码
+      if(obj.origCode == 1){
+        params.type = params.type + '_ORIG_CODE'
+      }
       _this.spinning = true
       printFun(
         dispatchDetailPrint,

+ 11 - 2
src/views/salesManagement/stockPrint/sendTypeModal.vue

@@ -47,6 +47,12 @@
             <a-radio value="-1">不打印</a-radio>
           </a-radio-group>
         </a-form-model-item>
+        <a-form-model-item label="原厂编码" prop="origCode" v-if="nowType=='print'">
+          <a-radio-group v-model="form.origCode">
+            <a-radio value="1">打印</a-radio>
+            <a-radio value="0">不打印</a-radio>
+          </a-radio-group>
+        </a-form-model-item>
       </a-form-model>
       <div class="btn-cont">
         <a-button id="pushOrderManagement-print-back" @click="handleCancel">取消</a-button>
@@ -94,11 +100,13 @@ export default {
       isShow: this.openModal, //  是否打开弹框
       form: {
         id: 'all',
-        orderBy: undefined
+        orderBy: undefined,
+        origCode: undefined
       },
       rules: {
         id: [{ required: true, message: '请选择产品分类', trigger: 'change' }],
-        orderBy: [{ required: true, message: '请选择货位编号', trigger: 'change' }]
+        orderBy: [{ required: true, message: '请选择货位编号', trigger: 'change' }],
+        origCode: [{ required: true, message: '请选择原厂编码', trigger: 'change' }]
       },
       formItemLayout: {
         labelCol: { span: 6 },
@@ -128,6 +136,7 @@ export default {
             if (_this.form.orderBy != '-1') {
               obj.orderBy = _this.form.orderBy
             }
+            obj.origCode = _this.form.origCode
             _this.$emit('ok', obj, '发货分类', type)
           }
           _this.isShow = false

+ 7 - 2
src/views/salesReturnManagement/custConfirm/list.vue

@@ -119,6 +119,11 @@
             <returnReason v-if="record.isEdit" v-model="record.returnReason" @blur="blurReason(record)"></returnReason>
             <span v-else>{{ record.returnReason||'--' }}</span>
           </template>
+          <!-- 备注 -->
+          <template slot="remarks" slot-scope="text, record">
+            <a-input v-if="record.isEdit" size="small" v-model.trim="record.remarks" allowClear placeholder="请输入备注信息(最多50字符)"/>
+            <span v-else>{{ record.remarks||'--' }}</span>
+          </template>
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
             <div v-if="record.isEdit">
@@ -302,8 +307,8 @@ export default {
         // { title: '实际退货单价', dataIndex: 'price', align: 'center', width: '10%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '实际退货金额', dataIndex: 'totalAmount', align: 'center', width: '10%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '退货单价说明', dataIndex: 'priceRemark', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '退货原因', dataIndex: 'returnReason', width: '20%', align: 'center', scopedSlots: { customRender: 'returnReason' } },
-        { title: '备注', dataIndex: 'priceRemark', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '退货原因', dataIndex: 'returnReason', width: '15%', align: 'center', scopedSlots: { customRender: 'returnReason' } },
+        { title: '备注', dataIndex: 'remarks', width: '15%', align: 'center', scopedSlots: { customRender: 'remarks' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '20%', align: 'center' }
       ]
       if (this.$hasPermissions('B_salesReturnConfirm_salesPrice')) { //  售价权限

+ 1 - 0
src/views/salesReturnManagement/receiveCheck/chooseProductsModal.vue

@@ -14,6 +14,7 @@
           <!-- 查询配件列表 -->
           <queryPart
             ref="partQuery"
+            :showRemark="true"
             :showReceiveQty="true"
             :isShowPrice="isShowPrice"
             :returnReasonList="returnReasonList"

+ 15 - 5
src/views/salesReturnManagement/receiveCheck/list.vue

@@ -20,6 +20,16 @@
                 <dealerSubareaScopeList ref="dealerSubareaScopeList" id="receiveCheck-buyerSn" @change="custChange" />
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="退货类别">
+                <v-select
+                  v-model="queryParam.billStatus"
+                  ref="billStatus"
+                  code="SALES_RETURN_BILL_STATUS"
+                  placeholder="请选择退货类别"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="业务状态">
                 <v-select
@@ -175,19 +185,19 @@ export default {
       const arr = [
         { title: '编号', dataIndex: 'no', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
         { 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: 'warehouseName', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '总部销退单号', scopedSlots: { customRender: 'salesReturnBillNo' }, width: '8%', align: 'center' },
+        { title: '客户名称', dataIndex: 'buyerName', width: '12%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '退货类别', dataIndex: 'warehouseName', width: '6%', 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 : '--') } },
         { title: '良品数量', dataIndex: 'totalGoodQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '返库数量', dataIndex: 'totalBackStockQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '业务状态', dataIndex: 'billStatusDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务状态', dataIndex: 'billStatusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
       ]
       if (this.isShowWarehouse) {
-        arr.splice(4, 0, { title: '退货仓库', dataIndex: 'warehouseName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true })
+        arr.splice(5, 0, { title: '退货仓库', dataIndex: 'warehouseName', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true })
       }
       return arr
     }

+ 17 - 10
src/views/salesReturnManagement/receiveCheck/receiving.vue

@@ -28,7 +28,7 @@
             :loading="loading"
             @click="openGuideModal=true"
             style="margin-right:5px;"
-            >导入产品</a-button>
+          >导入产品</a-button>
           <a-button type="primary" :loading="loading" class="button-info" @click="openModal = true">新增产品</a-button>
           <a-button type="primary" :loading="loading" class="button-error" @click="handlePlss">批量实收</a-button>
           <span v-if="rowSelectionInfo&&rowSelectionInfo.selectedRowKeys&&rowSelectionInfo.selectedRowKeys.length">已选{{ rowSelectionInfo.selectedRowKeys.length }}项</span>
@@ -83,6 +83,12 @@
               @blur="e => onCellBlurReturnReason(e, record)"></returnReason>
             <span v-else>{{ record.returnReason }}</span>
           </template>
+          <!-- 备注 -->
+          <template slot="remarks" slot-scope="text, record">
+            <div @dblclick.stop>
+              <a-input :maxLength="50" size="small" v-model="record.remarks" placeholder="请输入备注(最多50字符)"/>
+            </div>
+          </template>
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
             <div>
@@ -116,8 +122,8 @@
       :buyerSn="$route.params.buyerSn"
       @close="openModal=false"
       @addProduct="addProduct"></chooseProductsModal>
-      <!-- 导入产品 -->
-      <importGuideModal :params="{salesReturnBillSn: $route.params.sn}" :openModal="openGuideModal" @close="openGuideModal=false" @ok="importOk" />
+    <!-- 导入产品 -->
+    <importGuideModal :params="{salesReturnBillSn: $route.params.sn}" :openModal="openGuideModal" @close="openGuideModal=false" @ok="importOk" />
   </div>
 </template>
 
@@ -191,12 +197,13 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'productEntity.code', align: 'center', width: '10%', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productEntity.name', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '申请退货数量', dataIndex: 'initialQty', align: 'center', width: '10%', scopedSlots: { customRender: 'initialQty' } },
-        { title: '仓库实收数量', dataIndex: 'receiveQty', align: 'center', width: '10%', scopedSlots: { customRender: 'receiveQty' } },
+        { title: '产品名称', dataIndex: 'productEntity.name', width: '16%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '申请退货数量', dataIndex: 'initialQty', align: 'center', width: '8%', scopedSlots: { customRender: 'initialQty' } },
+        { title: '仓库实收数量', dataIndex: 'receiveQty', align: 'center', width: '8%', scopedSlots: { customRender: 'receiveQty' } },
         { title: '单位', dataIndex: 'productEntity.unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         // { title: '退货单价', dataIndex: 'price', align: 'center', width: '10%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '退货原因', dataIndex: 'returnReason', width: '25%', align: 'center', scopedSlots: { customRender: 'returnReason' } },
+        { title: '退货原因', dataIndex: 'returnReason', width: '19%', align: 'center', scopedSlots: { customRender: 'returnReason' } },
+        { title: '备注', dataIndex: 'remarks', width: '19%', align: 'center', scopedSlots: { customRender: 'remarks' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
       return arr
@@ -212,10 +219,10 @@ export default {
       this.$router.push({ name: 'receiveCheckList' })
     },
     // 确认导入明细
-    importOk(data){
+    importOk (data) {
       this.spinning = true
-      salesReturnDetailBatchByReceive({detailList:data, salesReturnBillSn: this.orderSn}).then(res => {
-        if(res.status == 200){
+      salesReturnDetailBatchByReceive({ detailList: data, salesReturnBillSn: this.orderSn }).then(res => {
+        if (res.status == 200) {
           this.resetSearchForm()
           this.$message.info(res.message)
         }

+ 18 - 5
src/views/salesReturnManagement/salesReturn/queryPart.vue

@@ -67,6 +67,12 @@
           <returnReason v-model.trim="record.returnReason"></returnReason>
         </div>
       </template>
+      <!-- 备注 -->
+      <template slot="remarks" slot-scope="text, record">
+        <div @dblclick.stop>
+          <a-input :maxLength="50" size="small" v-model="record.remarks" placeholder="请输入备注(最多50字符)"/>
+        </div>
+      </template>
       <span slot="customTitle">
         操作
         <a-popover>
@@ -111,6 +117,10 @@ export default {
     showReceiveQty: {
       type: Boolean,
       default: false
+    },
+    showRemark: {
+      type: Boolean,
+      default: false
     }
   },
   data () {
@@ -170,11 +180,11 @@ export default {
       // this.queryParam.warehouseSn = warehouseSn
       const arr = [
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
-        { title: '产品编码', dataIndex: 'code', width: '24%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'name', width: '27%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品编码', dataIndex: 'code', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'name', width: '23%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '单位', dataIndex: 'unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '申请退货数量', dataIndex: 'qty', width: '9%', align: 'center', scopedSlots: { customRender: 'qty' } },
-        { title: '退货原因', dataIndex: 'returnReason', width: '10%', align: 'center', scopedSlots: { customRender: 'returnReason' } },
+        { title: '申请退货数量', dataIndex: 'qty', width: '8%', align: 'center', scopedSlots: { customRender: 'qty' } },
+        { title: '退货原因', dataIndex: 'returnReason', width: '12%', align: 'center', scopedSlots: { customRender: 'returnReason' } },
         { slots: { title: 'customTitle' }, scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
       let i = 5
@@ -184,7 +194,10 @@ export default {
       }
       // 实收数量是否显示
       if (this.showReceiveQty) {
-        arr.splice(i, 0, { title: '仓库实收数量', dataIndex: 'receiveQty', width: '9%', align: 'center', scopedSlots: { customRender: 'receiveQty' } })
+        arr.splice(i, 0, { title: '仓库实收数量', dataIndex: 'receiveQty', width: '8%', align: 'center', scopedSlots: { customRender: 'receiveQty' } })
+      }
+      if (this.showRemark) {
+        arr.splice(i + 2, 0, { title: '备注', dataIndex: 'remarks', width: '12%', align: 'center', scopedSlots: { customRender: 'remarks' } })
       }
       this.columns = arr
       this.resetSearchForm()

+ 1 - 1
vue.config.js

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