zhouhao před 2 roky
rodič
revize
85c898e995

+ 1 - 1
src/components/SalesHeader/SalesHeader.vue

@@ -37,7 +37,7 @@
 <!--        </el-col>-->
         <el-col :xs="24" :ms="6" :lg="6">
           <el-form-item label="发货仓库名称" prop="stockType">
-            <el-select v-model="screenForm.stockType" placeholder="请选择" clearable>
+            <el-select disabled v-model="screenForm.stockType" placeholder="请选择" clearable>
               <el-option
                 label="前置仓"
                 :value="1"

+ 2 - 0
src/views/basic_data/stock/stock_fee_list.vue

@@ -444,9 +444,11 @@ export default {
           item.sums1 = ['qty', 'sendQty', 'directTransferQty', 'hasSendQty', 'refundableQty']
           item.sums2 = ['price', 'totalAmount', 'payAmount', 'rebateAmount', 'payRebateAmount', 'totalDiscAmount']
         })
+
         this.dataList = res.data.records
         this.listTotal = res.data.total
         this.listLoading = false
+        console.log(res,this.dataList)
       })
       this.getWarehouseList()
       this.getCategoryList()

+ 4 - 1
src/views/sales_control/components/WarehouseForm.vue

@@ -140,6 +140,9 @@ export default {
           return
         }
       })
+      if (!this.dataList.length) {
+        this.customerNumber = ''
+      }
     },
     //去掉相同数据
     resArr(arr1, arr2) {
@@ -150,7 +153,7 @@ export default {
         this.dataList = this.resArr(this.dataList, this.selection)
         for (let i = 0; i < this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.length; i++) {
           for (let j = 0; j < this.selected.length; j++) {
-            if (this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i].id == this.selected[j].id) {
+            if (this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i].id == this.selected[j].id|| this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i].disabled ===true) {
               // k.disabled = true
               this.$set(this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i], 'disabled', true)
             }

+ 1 - 1
src/views/sales_control/sales_management/components/customer_sales_form.vue

@@ -228,7 +228,7 @@ export default {
         this.dataList = this.resArr(this.dataList, this.selection)
         for (let i = 0; i <this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.length ; i++) {
           for (let j = 0; j < this.selected.length; j++) {
-            if ( this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i].id == this.selected[j].id){
+            if ( this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i].id == this.selected[j].id|| this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i].disabled ===true){
               // k.disabled = true
               this.$set(this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i],'disabled',true)
             }

+ 4 - 1
src/views/sales_control/sales_management/components/return_sales_form.vue

@@ -195,6 +195,9 @@ export default {
           return
         }
       })
+      if (!this.dataList.length) {
+        this.returnId = ''
+      }
       // if (!this.dataList.length){
       //   this.$nextTick(()=>{
       //     this.details = {}
@@ -211,7 +214,7 @@ export default {
         this.dataList = this.resArr(this.dataList, this.selection)
         for (let i = 0; i <this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.length ; i++) {
           for (let j = 0; j < this.selected.length; j++) {
-            if ( this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i].id == this.selected[j].id){
+            if ( this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i].id == this.selected[j].id || this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i].disabled ===true){
               // k.disabled = true
               this.$set(this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i],'disabled',true)
             }