فهرست منبع

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

# Conflicts:
#	public/version.json
lilei 2 سال پیش
والد
کامیت
8bbba28fea

+ 1 - 1
public/version.json

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

+ 1 - 0
src/views/reportData/purchaseReturnReport/purchaseReturnDetail.vue

@@ -299,6 +299,7 @@ export default {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
       this.resetSearchForm()
+      this.getSupperList()
     }
   },
   beforeRouteEnter (to, from, next) {

+ 1 - 0
src/views/reportData/purchaseReturnReport/purchaseReturnOrder.vue

@@ -254,6 +254,7 @@ export default {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
       this.resetSearchForm()
+      this.getSupperList()
     }
   },
   beforeRouteEnter (to, from, next) {

+ 9 - 9
src/views/reportData/urgentItemsOffsetReport/detailList.vue

@@ -35,13 +35,13 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="急件类型">
+              <a-form-item label="单据来源">
                 <v-select
-                  v-model="queryParam.bizType"
-                  ref="status"
-                  id="urgentItemsOffsetReport-biztype"
-                  code="URGENT_BIZ_TYPE"
-                  placeholder="急件类型"
+                  v-model="queryParam.sourceType"
+                  ref="sourceType"
+                  id="urgentItemsOffsetReport-sourceType"
+                  code="SALES_SOURCE"
+                  placeholder="请选择单据来源"
                   allowClear></v-select>
               </a-form-item>
             </a-col>
@@ -134,7 +134,7 @@ export default {
         buyerName: '',
         bizBillNo: '',
         urgentBillNo: '',
-        bizType: undefined,
+        sourceType: undefined,
         productType: undefined,
         productBrandSn: undefined, //  产品品牌
         productTypeSn1: '', //  产品一级分类
@@ -180,8 +180,8 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '急件单号', dataIndex: 'urgentBillNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '急件类型', dataIndex: 'bizTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售单号', dataIndex: 'bizBillNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单据来源', dataIndex: 'sourceTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'buyerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '13%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
@@ -232,7 +232,7 @@ export default {
       this.queryParam.bizBillNo = ''
       this.queryParam.buyerName = ''
       this.queryParam.urgentBillNo = ''
-      this.queryParam.bizType = undefined
+      this.queryParam.sourceType = undefined
       this.queryParam.productBrandSn = undefined
       this.queryParam.productTypeSn1 = ''
       this.queryParam.productTypeSn2 = ''

+ 9 - 9
src/views/reportData/urgentItemsOffsetReport/list.vue

@@ -34,13 +34,13 @@
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
-            <a-form-item label="急件类型">
+            <a-form-item label="单据来源">
               <v-select
-                v-model="queryParam.bizType"
-                ref="status"
-                id="urgentItemsOffsetReport-biztype"
-                code="URGENT_BIZ_TYPE"
-                placeholder="急件类型"
+                v-model="queryParam.sourceType"
+                ref="sourceType"
+                id="urgentItemsOffsetReport-sourceType"
+                code="SALES_SOURCE"
+                placeholder="请选择单据来源"
                 allowClear></v-select>
             </a-form-item>
           </a-col>
@@ -107,7 +107,7 @@ export default {
         buyerName: '',
         bizBillNo: '',
         urgentBillNo: '',
-        bizType: undefined
+        sourceType: undefined
       },
       rules: {
         'time': [{ required: true, message: '请选择冲减时间', trigger: 'change' }]
@@ -145,8 +145,8 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '急件单号', dataIndex: 'urgentBillNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '急件类型', dataIndex: 'bizTypeDictValue', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售单号', dataIndex: 'bizBillNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单据来源', dataIndex: 'sourceTypeDictValue', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'buyerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '款数', dataIndex: 'totalCategory', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '数量', dataIndex: 'totalQty', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -196,7 +196,7 @@ export default {
         buyerName: '',
         bizBillNo: '',
         urgentBillNo: '',
-        bizType: undefined
+        sourceType: undefined
       }
       this.$refs.rangeDate.resetDate()
       this.$refs.ruleForm.resetFields()

+ 9 - 9
src/views/salesManagement/urgentItemsOffset/list.vue

@@ -27,13 +27,13 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="急件类型">
+                <a-form-item label="单据来源">
                   <v-select
-                    v-model="queryParam.bizType"
-                    ref="status"
-                    id="chainTransferInList-biztype"
-                    code="URGENT_BIZ_TYPE"
-                    placeholder="请选择急件类型"
+                    v-model="queryParam.sourceType"
+                    ref="sourceType"
+                    id="urgentItemsOffsetList-sourceType"
+                    code="SALES_SOURCE"
+                    placeholder="请选择单据来源"
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
@@ -125,14 +125,14 @@ export default {
         bizBillNo: '', //  关联单号
         urgentBillNo: '', //  急件单号
         status: undefined, //  状态
-        bizType: undefined // 急件类型
+        sourceType: undefined // 单据来源
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '急件单号', scopedSlots: { customRender: 'urgentBillNo' }, width: '15%', align: 'center' },
-        { 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: 'sourceTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位名称', dataIndex: 'buyerName', width: '24%', 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 : '--') } },
@@ -197,7 +197,7 @@ export default {
       this.queryParam.bizBillNo = ''
       this.queryParam.urgentBillNo = ''
       this.queryParam.status = undefined
-      this.queryParam.bizType = undefined
+      this.queryParam.sourceType = undefined
       this.$refs.custList.resetForm()
       this.$refs.table.refresh(true)
     },