lilei 1 gadu atpakaļ
vecāks
revīzija
32ba27ba26

+ 1 - 1
public/version.json

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

+ 11 - 8
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -156,9 +156,7 @@
                     class="button-primary"
                     :loading="addLoading"
                     @click="handleAdd(record,0)"
-                    v-if="record.purchasePrice>0"
                     id="purchaseOrderEdit-add-btn">添加</a-button>
-                  <span v-else>--</span>
                 </template>
               </s-table>
             </div>
@@ -388,7 +386,7 @@ export default {
         { title: '产品图片', scopedSlots: { customRender: 'imageUrl' }, width: '6%', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
-      // 产品来源
+      // 产品来源 
       if (this.isDealerUp) {
         arr.splice(1, 0, { title: '产品编码', scopedSlots: { customRender: 'code' }, width: '15%', align: 'center', sorter: true })
         arr.splice(6, 0, { title: '产品来源', dataIndex: 'sysFlagDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } })
@@ -505,11 +503,16 @@ export default {
       }
       // 添加
       if (type == 0) {
-        params.productSn = row.productSn
-        params.purchaseBillSn = this.detail.purchaseBillSn
-        params.purchaseBillNo = this.detail.purchaseBillNo
-        params.price = row.purchasePrice
-        params.qty = row.qty
+        if(row.purchasePrice&&row.terminalPrice&&row.carOwnersPrice){
+          params.productSn = row.productSn
+          params.purchaseBillSn = this.detail.purchaseBillSn
+          params.purchaseBillNo = this.detail.purchaseBillNo
+          params.price = row.purchasePrice
+          params.qty = row.qty
+        }else{
+          this.$message.warning('成本价、终端会员价、终端会员价不能为空!')
+          return
+        }
       } else { //  编辑
         // 清空成本价或数量时,值应保持未清空前的值,因成本价和数量都不可为空
         if (!row.qty) {

+ 1 - 3
src/views/purchasingManagement/purchaseOrderNew/chooseProductModal.vue

@@ -104,9 +104,7 @@
               class="button-primary"
               :loading="addLoading"
               @click="handleAdd(record)"
-              v-if="record.purchasePrice>0"
-              id="purchaseOrderEdit-add-btn">添加</a-button>
-            <span v-else>--</span>
+              >添加</a-button>
           </template>
         </s-table>
         <div v-else>

+ 11 - 5
src/views/purchasingManagement/purchaseOrderNew/edit.vue

@@ -414,11 +414,17 @@ export default {
       }
       // 添加
       if (type == 0) {
-        params.productSn = row.productSn
-        params.purchaseBillSn = this.detail.purchaseBillSn
-        params.purchaseBillNo = this.detail.purchaseBillNo
-        params.price = row.purchasePrice
-        params.qty = row.qty
+        if(row.purchasePrice&&row.terminalPrice&&row.carOwnersPrice){
+          params.productSn = row.productSn
+          params.purchaseBillSn = this.detail.purchaseBillSn
+          params.purchaseBillNo = this.detail.purchaseBillNo
+          params.price = row.purchasePrice
+          params.qty = row.qty
+        }else{
+          this.$message.warning('成本价、终端会员价、终端会员价不能为空!')
+          this.$refs.chooseProduct.spinning = false
+          return
+        }
       } else { //  编辑
         // 清空成本价或数量时,值应保持未清空前的值,因成本价和数量都不可为空
         if (!row.qty) {

+ 6 - 6
src/views/salesManagement/salesQuery/list.vue

@@ -269,15 +269,15 @@ export default {
       showDiscount: false,
       showCell: false,
       time: [
-        getDate.getMonthDays(12).starttime,
-        getDate.getMonthDays(12).endtime
+        getDate.getMonthDays(3).starttime,
+        getDate.getMonthDays(3).endtime
       ],
       auditTime: [],
       outWareTime: [],
       // 查询参数
       queryParam: {
-        beginDate: getDate.getMonthDays(12).starttime,
-        endDate: getDate.getMonthDays(12).endtime,
+        beginDate: getDate.getMonthDays(3).starttime,
+        endDate: getDate.getMonthDays(3).endtime,
         auditBeginDate: '',
         auditEndDate: '',
         outWarehouseBeginDate: '',
@@ -503,8 +503,8 @@ export default {
     // 重置数据
     resetData (flag) {
       this.$refs.rangeDate.resetDate(flag ? '' : this.time)
-      this.queryParam.beginDate = flag ? '' : getDate.getMonthDays(12).starttime
-      this.queryParam.endDate = flag ? '' : getDate.getMonthDays(12).endtime
+      this.queryParam.beginDate = flag ? '' : getDate.getMonthDays(3).starttime
+      this.queryParam.endDate = flag ? '' : getDate.getMonthDays(3).endtime
 
       this.queryParam.auditBeginDate = ''
       this.queryParam.auditEndDate = ''

+ 6 - 6
src/views/salesManagement/salesQueryNew/list.vue

@@ -270,15 +270,15 @@ export default {
       showDiscount: false,
       showCell: false,
       time: [
-        getDate.getMonthDays(12).starttime,
-        getDate.getMonthDays(12).endtime
+        getDate.getMonthDays(3).starttime,
+        getDate.getMonthDays(3).endtime
       ],
       auditTime: [],
       outWareTime: [],
       // 查询参数
       queryParam: {
-        beginDate: getDate.getMonthDays(12).starttime,
-        endDate: getDate.getMonthDays(12).endtime,
+        beginDate: getDate.getMonthDays(3).starttime,
+        endDate: getDate.getMonthDays(3).endtime,
         auditBeginDate: '',
         auditEndDate: '',
         outWarehouseBeginDate: '',
@@ -505,8 +505,8 @@ export default {
     // 重置数据
     resetData (flag) {
       this.$refs.rangeDate.resetDate(flag ? '' : this.time)
-      this.queryParam.beginDate = flag ? '' : getDate.getMonthDays(12).starttime
-      this.queryParam.endDate = flag ? '' : getDate.getMonthDays(12).endtime
+      this.queryParam.beginDate = flag ? '' : getDate.getMonthDays(3).starttime
+      this.queryParam.endDate = flag ? '' : getDate.getMonthDays(3).endtime
 
       this.queryParam.auditBeginDate = ''
       this.queryParam.auditEndDate = ''