lilei 3 роки тому
батько
коміт
f5c3d2b0b6

+ 1 - 1
src/config/router.config.js

@@ -307,7 +307,7 @@ export const asyncRouterMap = [
                 }
               }
             ]
-          },
+          }
         ]
       },
       // 销售管理

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

@@ -13,8 +13,8 @@
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="基础信息">
             <a-descriptions :column="3">
-              <a-descriptions-item label="客户名称">{{ (detailData&&detailData.buyerName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="客户地址">
+              <a-descriptions-item label="单位名称">{{ (detailData&&detailData.buyerName) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="单位地址">
                 <div v-if="detailData&&(detailData.shippingAddressProvinceName || detailData.shippingAddressCityName || detailData.shippingAddressCountyName || detailData.shippingAddress)">
                   {{ (detailData&&detailData.shippingAddressProvinceName) || '' }}
                   {{ (detailData&&detailData.shippingAddressCityName) || '' }}

+ 24 - 10
src/views/salesManagement/urgentItemsOffset/list.vue

@@ -11,13 +11,13 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="客户名称">
+              <a-form-item label="单位名称">
                 <custList ref="custList" @change="custChange" v-model="queryParam.buyerSn"></custList>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="销售单号">
-                <a-input id="urgentItemsOffsetList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+              <a-form-item label="关联单号">
+                <a-input id="urgentItemsOffsetList-bizBillNo" v-model.trim="queryParam.bizBillNo" allowClear placeholder="请输入销售单号"/>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
@@ -26,6 +26,17 @@
                   <a-input id="urgentItemsOffsetList-urgentBillNo" v-model.trim="queryParam.urgentBillNo" allowClear placeholder="请输入急件单号"/>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="急件类型">
+                  <v-select
+                    v-model="queryParam.bizType"
+                    ref="status"
+                    id="chainTransferInList-biztype"
+                    code="URGENT_BIZ_TYPE"
+                    placeholder="请选择状态"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="状态">
                   <v-select
@@ -95,18 +106,20 @@ export default {
         beginDate: getDate.getCurrMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
         buyerSn: undefined, //  客户名称
-        salesBillNo: '', //  销售单号
+        bizBillNo: '', //  关联单号
         urgentBillNo: '', //  急件单号
-        status: undefined //  状态
+        status: undefined, //  状态
+        bizType: undefined // 急件类型
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '急件单号', scopedSlots: { customRender: 'urgentBillNo' }, width: '15%', align: 'center' },
-        { title: '销售单号', dataIndex: 'salesBillNo', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'buyerName', width: '25%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '总款数', dataIndex: 'totalCategory', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总数量', dataIndex: 'totalQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '急件类型', dataIndex: 'bizTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '关联单号', dataIndex: 'bizBillNo', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单位名称', dataIndex: 'buyerName', width: '21%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '总款数', dataIndex: 'totalCategory', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总数量', dataIndex: 'totalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '创建时间', dataIndex: 'createDate', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '冲减时间', dataIndex: 'offSetTime', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '状态', dataIndex: 'statusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } }
@@ -143,9 +156,10 @@ export default {
       this.queryParam.beginDate = getDate.getCurrMonthDays().starttime
       this.queryParam.endDate = getDate.getCurrMonthDays().endtime
       this.queryParam.buyerSn = undefined
-      this.queryParam.salesBillNo = ''
+      this.queryParam.bizBillNo = ''
       this.queryParam.urgentBillNo = ''
       this.queryParam.status = undefined
+      this.queryParam.bizType = undefined
       this.$refs.custList.resetForm()
       this.$refs.table.refresh(true)
     },

+ 2 - 1
vue.config.js

@@ -109,7 +109,8 @@ const vueConfig = {
     proxy: {
       '/api': {
         // target: 'http://192.168.16.188:8503/qpls-md',
-        target: 'http://frps.chelingzhu.com:7800/qpls-md',
+        // target: 'http://frps.chelingzhu.com:7800/qpls-md',
+        target: 'http://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,