lilei 3 days ago
parent
commit
8d364660fa

+ 1 - 1
public/version.json

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

+ 5 - 5
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -87,7 +87,7 @@
               <div style="margin-top: 6px;">
                 <a-checkbox v-model="queryParam.zeroQtyFlag" id="inventoryQueryList-zeroQtyFlag">只查看有库存</a-checkbox>
                 <a-checkbox v-model="queryParam.enableFlag" :checked="queryParam.enableFlag" id="inventoryQueryList-enableFlag">包括禁用产品</a-checkbox>
-                <a-checkbox v-model="queryParam.freezeFlag" :checked="queryParam.freezeFlag" id="inventoryQueryList-freezeFlag">只查冻结产品</a-checkbox>
+                <a-checkbox v-model="queryParam.freezeQtyFlag" :checked="queryParam.freezeQtyFlag" id="inventoryQueryList-freezeQtyFlag">只查冻结产品</a-checkbox>
               </div>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -209,7 +209,7 @@ export default {
         warehouseLocationSn: '', // 仓位sn
         zeroQtyFlag: false, //  库存情况
         enableFlag: true, // 显示禁用产品
-        freezeFlag: false, // 冻结产品
+        freezeQtyFlag: false, // 冻结产品
         minUnsalableDays: undefined, // 滞销天数最小值
         maxUnsalableDays: undefined, // 滞销天数最大值
         productSysFlag: undefined // 产品来源,箭冠or自建
@@ -245,7 +245,7 @@ export default {
           // 格式化数据
           params.zeroQtyFlag = params.zeroQtyFlag ? '0' : ''
           params.enableFlag = params.enableFlag ? '' : '1'
-          params.freezeFlag = params.freezeFlag ? '0' : ''
+          params.freezeQtyFlag = params.freezeQtyFlag ? '1' : ''
 
           params.product = {
             sysFlag: params.productSysFlag || undefined
@@ -385,7 +385,7 @@ export default {
       this.queryParam.brandName = undefined
       this.queryParam.productTypeName = undefined
       this.queryParam.zeroQtyFlag = false
-      this.queryParam.freezeFlag = false
+      this.queryParam.freezeQtyFlag = false
       this.queryParam.warehouse = []
       this.queryParam.warehouseSn = ''
       this.queryParam.warehouseLocationSn = ''
@@ -426,7 +426,7 @@ export default {
       const params = JSON.parse(JSON.stringify(this.queryParam))
       params.zeroQtyFlag = params.zeroQtyFlag ? '0' : ''
       params.enableFlag = params.enableFlag ? '' : '1'
-      params.freezeFlag = params.freezeFlag ? '0' : ''
+      params.freezeQtyFlag = params.freezeQtyFlag ? '1' : ''
       params.showCost = this.$hasPermissions('M_ShowAllCost') ? 1 : 0
       // 仓库仓位
       params.warehouseSn = params.warehouse[0]

+ 7 - 6
src/views/reportData/salesDetailReport/list.vue

@@ -108,13 +108,13 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="客户关系">
-                <v-select code="CUSTOMER_RELATION_TYPE" id="salesReportList-buyerRelationType" v-model="queryParam.buyerRelationType" allowClear placeholder="请选择客户关系"></v-select>
+                <v-select code="CUSTOMER_RELATION_TYPE" id="salesReportList-customerRelationType" v-model="queryParam.customerRelationType" allowClear placeholder="请选择客户关系"></v-select>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="急件">
                 <v-select
-                  v-model="queryParam.status"
+                  v-model="queryParam.urgentBillStatus"
                   ref="status"
                   id="salesReportList-status"
                   code="URGENT_STATUS"
@@ -223,7 +223,8 @@ export default {
         salesBillNo: '', // 销售单号
         salesManName: '', // 销售员
         state: undefined, // 业务状态
-        buyerRelationType: undefined // 客户关系
+        customerRelationType: undefined, // 客户关系
+        urgentBillStatus: undefined // 急件状态
       },
       rules: {
         'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
@@ -275,7 +276,7 @@ export default {
         { title: '客户名称', dataIndex: 'salesTargetName', width: '8%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'productEntity.code', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '急件', dataIndex: 'productEntity.code', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '急件', dataIndex: 'urgentBillStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'productEntity.productBrandName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '二级分类', dataIndex: 'productTypeName', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productEntity.name', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
@@ -377,8 +378,8 @@ export default {
       this.queryParam.warehouseCascade = []
       this.queryParam.salesBillNo = ''
       this.queryParam.salesManName = ''
-      this.queryParam.buyerRelationType = undefined// 客户关系
-      this.queryParam.status = undefined // 急件状态
+      this.queryParam.customerRelationType = undefined// 客户关系
+      this.queryParam.urgentBillStatus = undefined // 急件状态
       this.productType = []
       this.totalData = null
       if (this.advanced) {

+ 7 - 7
src/views/reportData/salesProfitReport/list.vue

@@ -67,13 +67,13 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="客户关系">
-                <v-select code="CUSTOMER_RELATION_TYPE" id="salesReportList-buyerRelationType" v-model="queryParam.buyerRelationType" allowClear placeholder="请选择客户关系"></v-select>
+                <v-select code="CUSTOMER_RELATION_TYPE" id="salesReportList-customerRelationType" v-model="queryParam.customerRelationType" allowClear placeholder="请选择客户关系"></v-select>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="急件">
                 <v-select
-                  v-model="queryParam.status"
+                  v-model="queryParam.urgentBillStatus"
                   ref="status"
                   id="salesReportList-status"
                   code="URGENT_STATUS"
@@ -171,8 +171,8 @@ export default {
         settleStyleSn: undefined,
         salesBillNo: '', // 销售单号
         salesManName: '', // 销售人员
-        buyerRelationType: undefined, // 客户关系
-        status: undefined // 急件状态
+        customerRelationType: undefined, // 客户关系
+        urgentBillStatus: undefined // 急件状态
       },
       creatTime: [], // 创建时间
       time: [], // 审核时间
@@ -218,7 +218,7 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '销售单号', dataIndex: 'salesBillNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '急件', dataIndex: 'productEntity.code', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '急件', dataIndex: 'urgentBillStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'salesTargetName', width: '20%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '款数', dataIndex: 'totalCategory', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -315,8 +315,8 @@ export default {
       this.queryParam.showCost = undefined
       this.queryParam.salesBillNo = ''
       this.queryParam.salesManName = ''
-      this.queryParam.buyerRelationType = undefined// 客户关系
-      this.queryParam.status = undefined // 急件状态
+      this.queryParam.customerRelationType = undefined// 客户关系
+      this.queryParam.urgentBillStatus = undefined // 急件状态
       this.$refs.ruleForm.resetFields()
       this.totalData = null
       if (this.advanced) {

+ 3 - 3
src/views/reportData/salesRankingReport/list.vue

@@ -42,7 +42,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="客户关系">
-                  <v-select code="CUSTOMER_RELATION_TYPE" id="salesDetailReportList-buyerRelationType" v-model="queryParam.buyerRelationType" allowClear placeholder="请选择客户关系"></v-select>
+                  <v-select code="CUSTOMER_RELATION_TYPE" id="salesDetailReportList-customerRelationType" v-model="queryParam.customerRelationType" allowClear placeholder="请选择客户关系"></v-select>
                 </a-form-model-item>
               </a-col>
             </template>
@@ -188,7 +188,7 @@ export default {
         productTypeSn3: undefined, //  产品三级分类
         productCode: undefined, // 产品编码
         productName: undefined, // 产品名称
-        buyerRelationType: undefined
+        customerRelationType: undefined
       },
       productType: [], // 产品分类
       rules: {
@@ -323,7 +323,7 @@ export default {
       this.queryParam.productTypeSn3 = undefined
       this.queryParam.productCode = undefined
       this.queryParam.productName = undefined
-      this.queryParam.buyerRelationType = undefined
+      this.queryParam.customerRelationType = undefined
       this.productType = []
       this.$refs.ruleForm.resetFields()
       this.totalData = null

+ 7 - 7
src/views/reportData/salesReport/list.vue

@@ -68,13 +68,13 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="客户关系">
-                <v-select code="CUSTOMER_RELATION_TYPE" id="salesReportList-buyerRelationType" v-model="queryParam.buyerRelationType" allowClear placeholder="请选择客户关系"></v-select>
+                <v-select code="CUSTOMER_RELATION_TYPE" id="salesReportList-customerRelationType" v-model="queryParam.customerRelationType" allowClear placeholder="请选择客户关系"></v-select>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="急件">
                 <v-select
-                  v-model="queryParam.status"
+                  v-model="queryParam.urgentBillStatus"
                   ref="status"
                   id="salesReportList-status"
                   code="URGENT_STATUS"
@@ -168,8 +168,8 @@ export default {
         settleStyleSn: undefined,
         salesBillNo: '', // 销售单号
         salesManName: '', // 销售人员
-        buyerRelationType: undefined, // 客户关系
-        status: undefined // 急件状态
+        customerRelationType: undefined, // 客户关系
+        urgentBillStatus: undefined // 急件状态
       },
       creatTime: [], // 创建时间
       time: [], // 审核时间
@@ -215,7 +215,7 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '销售单号', dataIndex: 'salesBillNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '急件', dataIndex: 'productEntity.code', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '急件', dataIndex: 'urgentBillStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'salesTargetName', width: '20%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '款数', dataIndex: 'totalCategory', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -312,8 +312,8 @@ export default {
       this.queryParam.showCost = undefined
       this.queryParam.salesBillNo = ''
       this.queryParam.salesManName = ''
-      this.queryParam.buyerRelationType = undefined// 客户关系
-      this.queryParam.status = undefined // 急件状态
+      this.queryParam.customerRelationType = undefined// 客户关系
+      this.queryParam.urgentBillStatus = undefined // 急件状态
       this.$refs.ruleForm.resetFields()
       this.totalData = null
       if (this.advanced) {

+ 4 - 4
src/views/salesManagement/salesReturn/queryPart.vue

@@ -231,7 +231,7 @@ export default {
         return [
           {
             title: '批发价',
-            key: 'specialPrice',
+            key: 'wholesalePrice',
             disabled: false,
             checked: false
           },
@@ -266,7 +266,7 @@ export default {
           { title: '销售单号', dataIndex: 'salesBillNo', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
           { title: '销售审核时间', dataIndex: 'auditDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
           { title: '售价', dataIndex: 'price', align: 'right', width: '5%', scopedSlots: { customRender: 'price' } },
-          // { title: '批发价', dataIndex: 'specialPrice', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+          // { title: '批发价', dataIndex: 'wholesalePrice', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
           // { title: '终端价', dataIndex: 'terminalPrice', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
           { title: '单位', dataIndex: 'dealerProductEntity.unit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
           { title: '销售数量', dataIndex: 'qty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -283,7 +283,7 @@ export default {
           { title: '产品名称', dataIndex: 'productName', width: '22%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
           { title: '原厂编码', dataIndex: 'productOrigCode', width: '21%', align: 'center', customRender: function (text) { return text || '--' } },
           { title: '售价', dataIndex: 'salePrice', width: '10%', align: 'right', scopedSlots: { customRender: 'price' } },
-          // { title: '批发价', dataIndex: 'specialPrice', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+          // { title: '批发价', dataIndex: 'wholesalePrice', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
           // { title: '终端价', dataIndex: 'terminalPrice', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
           { title: '单位', dataIndex: 'productUnit', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
           { title: '仓库仓位', scopedSlots: { customRender: 'warehouse' }, width: '10%', align: 'center' },
@@ -294,7 +294,7 @@ export default {
 
       // 省级且有市级价权限
       if (_this.currentDealerInfo && _this.currentDealerInfo.dealerLevel == 'PROVINCE' && _this.$hasPermissions('M_ShowAllCityPrice')) {
-        arr.splice(this.grabFlag == 1 ? 7 : 5, 0, { title: '批发价', dataIndex: 'specialPrice', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(this.grabFlag == 1 ? 7 : 5, 0, { title: '批发价', dataIndex: 'wholesalePrice', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(this.grabFlag == 1 ? 8 : 6, 0, { title: '终端价', dataIndex: 'terminalPrice', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       } else {
         arr.splice(this.grabFlag == 1 ? 7 : 5, 0, { title: '终端价', dataIndex: 'terminalPrice', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })

+ 3 - 3
src/views/salesManagement/salesReturn/salesReturnEdit.vue

@@ -302,7 +302,7 @@ export default {
         return [
           {
             title: '批发价',
-            key: 'specialPrice',
+            key: 'wholesalePrice',
             disabled: false,
             checked: false
           },
@@ -332,7 +332,7 @@ export default {
         { title: '产品名称', dataIndex: 'dealerProductEntity.name', align: 'left', width: '12%', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', align: 'center', width: '12%', customRender: function (text) { return text || '--' } },
         { title: '售价', dataIndex: 'price', align: 'center', width: '7%', scopedSlots: { customRender: 'price' } },
-        // { title: '批发价', dataIndex: 'specialPrice', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        // { title: '批发价', dataIndex: 'wholesalePrice', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         // { title: '终端价', dataIndex: 'terminalPrice', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '单位', dataIndex: 'dealerProductEntity.unit', align: 'center', width: '5%', customRender: function (text) { return text || '--' } },
         { title: '仓库仓位', scopedSlots: { customRender: 'warehouse' }, width: '12%', align: 'center' },
@@ -344,7 +344,7 @@ export default {
       ]
       // 省级且有市级价权限
       if (_this.currentDealerInfo && _this.currentDealerInfo.dealerLevel == 'PROVINCE' && _this.$hasPermissions('M_ShowAllCityPrice')) {
-        arr.splice(5, 0, { title: '批发价', dataIndex: 'specialPrice', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(5, 0, { title: '批发价', dataIndex: 'wholesalePrice', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(6, 0, { title: '终端价', dataIndex: 'terminalPrice', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       } else {
         arr.splice(5, 0, { title: '终端价', dataIndex: 'terminalPrice', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })

+ 3 - 3
src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue

@@ -290,7 +290,7 @@ export default {
         return [
           {
             title: '批发价',
-            key: 'specialPrice',
+            key: 'wholesalePrice',
             disabled: false,
             checked: false
           },
@@ -322,7 +322,7 @@ export default {
         { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', align: 'center', width: '10%', customRender: function (text) { return text || '--' } },
         { title: '销售单号', dataIndex: 'salesBillNo', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
         { title: '售价', dataIndex: 'price', align: 'right', width: '4%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        // { title: '批发价', dataIndex: 'specialPrice', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        // { title: '批发价', dataIndex: 'wholesalePrice', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         // { title: '终端价', dataIndex: 'terminalPrice', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '单位', dataIndex: 'dealerProductEntity.unit', align: 'center', width: '4%', customRender: function (text) { return text || '--' } },
         { title: '销售数量', dataIndex: 'salesQty', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -335,7 +335,7 @@ export default {
       ]
       // 省级且有市级价权限
       if (_this.currentDealerInfo && _this.currentDealerInfo.dealerLevel == 'PROVINCE' && _this.$hasPermissions('M_ShowAllCityPrice')) {
-        arr.splice(5, 0, { title: '批发价', dataIndex: 'specialPrice', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(5, 0, { title: '批发价', dataIndex: 'wholesalePrice', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(6, 0, { title: '终端价', dataIndex: 'terminalPrice', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       } else {
         arr.splice(5, 0, { title: '终端价', dataIndex: 'terminalPrice', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })