zhouhao 2 年之前
父節點
當前提交
d694064cb9

+ 2 - 2
src/components/SalesDialog/SalesDialog.vue

@@ -155,8 +155,8 @@ export default {
       // this.$parent.dialogVisible = false
     },
     selectable(row,index){
-      if (this.customerNumber){
-        if (row.customerNumber == this.customerNumber){
+      if (this.customerNumber || row.disabled){
+        if (row.customerNumber == this.customerNumber || row.disabled){
           return true
         }else{
           return  false

+ 2 - 2
src/views/sales_control/components/WarehouseExamine.vue

@@ -87,7 +87,7 @@ export default {
           width: '180'
         },
         {
-          prop: 'directFlag',
+          prop: 'directFlagText',
           label: '发生方向',
           width: '180'
         },
@@ -113,7 +113,7 @@ export default {
       getFrontDetail({ id: this.detailsId }).then(res => {
         this.details = res.data
         res.data.orders.forEach(k=>{
-          k.directFlag = k.directFlag ==1?'增加':'减少'
+          k.directFlagText = k.directFlag ==1?'增加':'减少'
         })
         this.dataList = res.data.orders
       })

+ 23 - 3
src/views/sales_control/sales_management/components/customer_sales_form.vue

@@ -140,8 +140,16 @@ export default {
       return func(...p)
     },
     confirm(selected) {
+      this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.forEach(k=>{
+        selected.forEach(l=>{
+          if ( l.id == k.id){
+            // k.disabled = true
+            this.$set(k,'disabled',false)
+          }
+        })
+      })
       this.dataList = [...this.dataList,...selected]
-      console.log(selected,this.dataList[0].stockType)
+      console.log(selected,this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData)
         if (!this.detailsId){
           this.$refs.header.screenForm.customerName = this.dataList[0].customerName
           this.$refs.header.screenForm.customerNumber = this.dataList[0].customerNumber
@@ -150,10 +158,16 @@ export default {
 
       this.customerNumber = this.dataList[0].customerNumber
       this.dialogVisible = false
-      // this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.$refs.tableView.clearSelection()
+      this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.$refs.tableView.clearSelection()
     },
     handleDel(item, index) {
       this.dataList.splice(index, 1)
+      this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.find(k=>{
+        if (k.id==item.id){
+          this.$set(k,'disabled',true)
+          return
+        }
+      })
       // this.$refs.multipleTable.clearSelection()
 
       // console.log(this.$refs.dia)
@@ -169,9 +183,15 @@ export default {
       return arr1.filter(v => arr2.every(val => val.id != v.id))
     },
     delChange() {
-
       if (this.dataList.length){
         this.dataList =  this.resArr(this.dataList,this.selection)
+        this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.forEach(k=>{
+          this.selection.forEach(l=>{
+            if ( l.id == k.id){
+              this.$set(k,'disabled',true)
+            }
+          })
+        })
         if (!this.dataList.length){
           this.customerNumber = ''
         }

+ 2 - 7
src/views/sales_control/sales_management/components/return_sales_details.vue

@@ -3,12 +3,7 @@
     <el-page-header @back="$parent.pageType=0" content="详情" style=" padding: 20px 20px 0 20px;"></el-page-header>
     <return-sales-header ref="header" :details="details" />
     <sales-table :dataList="dataList" :column="column" @handleSelection="handleSelection">
-      <template #bts>
-        <div>
-          <el-button type="primary" size="mini" @click="dialogVisible=true">添加</el-button>
-          <el-button type="danger" size="mini" @click="delChange">删除</el-button>
-        </div>
-      </template>
+
       <template #events>
         <div>
           <el-button type="primary" v-if="details.status==1||details.status==2" size="mini" @click="handleInform(2)">通知退货</el-button>
@@ -99,7 +94,7 @@ export default {
         {
           prop: 'notes',
           label: '备注',
-          width: '180',
+
 
         }
       ]    }

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

@@ -169,7 +169,7 @@ export default {
     },
     confirm(selected) {
       // console.log(selected)
-      console.log(  this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData)
+
       selected.forEach(k => {
         k.diffQty = Number(k.qty) - Number(k.refundQty)
       })