调整

src/views/sales_control/components/WarehouseForm.vue

@@ -31,7 +31,7 @@
         </el-popconfirm>
       </template>
     </sales-table>
-    <sales-dialog ref="dia" :dialogVisible="dialogVisible" :customerNumber="customerNumber"  :func="getDialogList"
+    <sales-dialog ref="dia" :dialogVisible="dialogVisible" :customerNumber="customerNumber" :func="getDialogList"
                   @confirm="confirm"
     />
   </div>
@@ -41,7 +41,7 @@
 import SalesDialog from '@/components/SalesDialog/SalesDialog'
 import WarehousingHeader from '@/components/WarehousingHeader/WarehousingHeader'
 import SalesTable from '@/components/SalesTable/SalesTable'
-import { getcustomerFrontList,addCustomerStockOrder } from '@/api/stock'
+import { getcustomerFrontList, addCustomerStockOrder } from '@/api/stock'
 import {
   addFrontOrder
 } from '@/api/sales'
@@ -99,7 +99,7 @@ export default {
           label: '备注',
           width: '180',
           isInput: true,
-          type:'text'
+          type: 'text'
         }
       ]
     }
@@ -115,20 +115,19 @@ export default {
     },
     confirm(selected) {
       // console.log(selected)
-      for (let i = 0; i <this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.length ; i++) {
+      for (let i = 0; i < this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.length; i++) {
         for (let j = 0; j < selected.length; j++) {
-          if ( this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i].id == selected[j].id){
+          if (this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i].id == selected[j].id) {
             // k.disabled = true
-            this.$set(this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i],'disabled',false)
-          }
-          else {
-            this.$set(this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i],'disabled',true)
+            this.$set(this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i], 'disabled', false)
+          } else {
+            this.$set(this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i], 'disabled', true)
 
           }
         }
       }
 
-      this.dataList = [...this.dataList,...JSON.parse(JSON.stringify(selected))]
+      this.dataList = [...this.dataList, ...JSON.parse(JSON.stringify(selected))]
       this.$refs.header.screenForm.customerName = this.dataList[0].customerName
       this.$refs.header.screenForm.customerNumber = this.dataList[0].customerNumber
       this.customerNumber = this.dataList[0].customerNumber
@@ -138,9 +137,9 @@ export default {
     },
     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)
+      this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.find(k => {
+        if (k.id == item.id) {
+          this.$set(k, 'disabled', true)
           return
         }
       })
@@ -150,19 +149,19 @@ 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)
-        for (let i = 0; i <this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.length ; i++) {
+      if (this.dataList.length) {
+        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) {
               // k.disabled = true
-              this.$set(this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i],'disabled',true)
+              this.$set(this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i], 'disabled', true)
             }
 
           }
         }
 
-        if (!this.dataList.length){
+        if (!this.dataList.length) {
           this.customerNumber = ''
         }
       }
@@ -179,7 +178,7 @@ export default {
           this.$errorMsg(`第${i + 1}产品数量有误`)
           return
         }
-        if (Number(this.dataList[i].stockChangeQty) == 0 && this.dataList[i].directFlag ==0) {
+        if (Number(this.dataList[i].stockChangeQty) == 0 && this.dataList[i].directFlag == 0) {
           this.$errorMsg(`第${i + 1}产品数量为0时发生方向只能做增加`)
           return
         }

src/views/sales_control/sales_management/components/customer_sales_details.vue

@@ -3,30 +3,17 @@
     <el-page-header @back="$parent.pageType=0" content="详情" style=" padding: 20px 20px 0 20px;"></el-page-header>
     <sales-header ref="header" />
     <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 v-if="details.status==1">
-          <el-button type="primary" size="mini" @click="handleInform(2)">通知发货</el-button>
-        </div>
-<!--        <div v-if=" details.status==2">-->
-<!--          <el-button type="primary" size="mini" @click="handleInform(3)">发货</el-button>-->
-<!--        </div>-->
-        <div v-if="details.status==2">
-          <el-button size="mini">撤销发货</el-button>
-        </div>
-        <div v-if="isFront===false && details.status==2">
-          <el-button type="primary" size="mini" @click="handleSignIn(4)">签收</el-button>
-        </div>
-      </template>
-      <template v-slot:custom="{item:{row,$index}}">
-        <el-radio label="1" v-model="row.flag">增加</el-radio>
-        <el-radio label="-1" v-model="row.flag">减少</el-radio>
+
+          <el-button v-if="details.status==1" type="primary" size="mini" @click="handleInform(2)">通知发货</el-button>
+
+          <el-button v-if="details.status==2" size="mini">撤销发货 {{details.status}}{{isFront}}</el-button>
+
+          <el-button v-if="isFront===false && details.status==2" type="primary" size="mini" @click="handleSignIn(4)">签收</el-button>
+
       </template>
+
 <!--      <template v-slot:operation="{item:{row,$index}}">-->
 <!--        <el-popconfirm-->
 <!--          style="margin-left: 10px"-->

src/views/sales_control/sales_management/components/customer_sales_form.vue

@@ -31,10 +31,7 @@
           <el-button size="mini" v-if="!detailsId" @click="onReset">重置</el-button>
         </div>
       </template>
-      <template v-slot:custom="{item:{row,$index}}">
-        <el-radio label="1" v-model="row.flag">增加</el-radio>
-        <el-radio label="-1" v-model="row.flag">减少</el-radio>
-      </template>
+
       <template v-slot:operation="{item:{row,$index}}">
         <el-popconfirm
           v-if="dis"
@@ -76,7 +73,7 @@ export default {
       disabled: false,
       flag: 1,
       dis: true,
-      column: [
+      column:  [
         {
           prop: 'materialName',
           label: '产品名称',
@@ -93,6 +90,11 @@ export default {
           width: '300'
         },
         {
+          prop: 'stockQty',
+          label: '库存数量',
+          width: '180'
+        },
+        {
           prop: 'qty',
           label: '数量',
           width: '180',
@@ -113,12 +115,12 @@ export default {
   },
   created() {
     if (this.detailsId) {
+
       getFrontOrderDetail({ id: this.detailsId }).then(res => {
         this.dataList = res.data.orders
         this.customerNumber = res.data.customerNumber
         this.$refs.header.screenForm = res.data
-        this.$refs.header.screenForm.disabled = this.disabled = res.data.status !== 1 ? true : false
-
+        this.$refs.header.screenForm.disabled = this.disabled = true
         this.$refs.header.screenForm.provinceId = res.data.province
         this.$refs.header.screenForm.cityId = res.data.city
         this.$refs.header.screenForm.areaId = res.data.area
@@ -127,14 +129,43 @@ export default {
       })
     } else {
       Object.assign(this.$data, this.$options.data())
+        this.column = [
+          {
+            prop: 'materialName',
+            label: '产品名称',
+            width: '180'
+          },
+          {
+            prop: 'materialCode',
+            label: '物料编码',
+            width: '180'
+          },
+          {
+            prop: 'specification',
+            label: '规格型号',
+            width: '300'
+          },
+          {
+            prop: 'stockQty',
+            label: '库存数量',
+            width: '180'
+          },
+          {
+            prop: 'qty',
+            label: '数量',
+            width: '180',
+            isInput: true
+          },
+          {
+            prop: 'notes',
+            label: '备注',
+            width: '180',
+            isInput: true,
+            type: 'text'
+
+          }
+        ]
 
-      this.column.splice(3, 0,
-        {
-          prop: 'stockQty',
-          label: '库存数量',
-          width: '180'
-        }
-      )
 
     }
   },
@@ -151,16 +182,16 @@ export default {
       return func(...p)
     },
     confirm(selected) {
+      console.log(selected,'222')
       for (let i = 0; i <this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.length ; i++) {
         for (let j = 0; j < selected.length; j++) {
           if ( this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i].id == selected[j].id){
             // k.disabled = true
             this.$set(this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i],'disabled',false)
-          }
-          else {
+          }else {
             this.$set(this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i],'disabled',true)
-
           }
+
         }
       }
       this.dataList = [...this.dataList, ...selected]
@@ -254,6 +285,44 @@ export default {
             addFrontOrder(params).then(res => {
               this.$successMsg('新增成功')
               this.dis = false
+              this.disabled = true
+              this.$set(this.$refs.header.screenForm,'disabled',true)
+              this.column = [
+                {
+                  prop: 'materialName',
+                  label: '产品名称',
+                  width: '180'
+                },
+                {
+                  prop: 'materialCode',
+                  label: '物料编码',
+                  width: '180'
+                },
+                {
+                  prop: 'specification',
+                  label: '规格型号',
+                  width: '300'
+                },
+                {
+                  prop: 'stockQty',
+                  label: '库存数量',
+                  width: '180'
+                },
+                {
+                  prop: 'qty',
+                  label: '数量',
+                  width: '180',
+              
+                },
+                {
+                  prop: 'notes',
+                  label: '备注',
+                  width: '180',
+
+                  type: 'text'
+
+                }
+              ]
               // this.$parent.pageType = 0
               this.salesId = res.data
               this.$forceUpdate()

src/views/sales_control/sales_management/components/return_sales_details.vue

@@ -11,10 +11,7 @@
         </div>
       </template>
 
-      <template v-slot:custom="{item:{row,$index}}">
-        <el-radio label="1" v-model="row.flag">增加</el-radio>
-        <el-radio label="-1" v-model="row.flag">减少</el-radio>
-      </template>
+
 <!--      <template v-slot:operation="{item:{row,$index}}">-->
 <!--        <el-popconfirm-->
 <!--          style="margin-left: 10px"-->

src/views/sales_control/sales_management/components/return_sales_form.vue

@@ -3,10 +3,12 @@
     <el-page-header @back="$parent.pageType=0" :content="detailsId?'编辑':'新增'" style=" padding: 20px 20px 0 20px;"
     ></el-page-header>
     <return-sales-header ref="header" :details="details" />
-    <sales-table :dataList="dataList" :column="column" :isOperation="detailsId?false:true" isSelection @handleSelection="handleSelection">
+    <sales-table :dataList="dataList" :column="column" :isOperation="detailsId?false:true" isSelection
+                 @handleSelection="handleSelection"
+    >
       <template #bts>
         <div v-if="!detailsId">
-          <el-button  type="primary" v-if="dis" size="mini" @click="dialogVisible=true">添加</el-button>
+          <el-button type="primary" v-if="dis" size="mini" @click="dialogVisible=true">添加</el-button>
           <el-button type="danger" v-if="dis" size="mini" @click="delChange">删除</el-button>
         </div>
       </template>
@@ -25,10 +27,7 @@
       <template v-slot:custom="{item:{row,$index}}">
         <div>{{ diffQty(row) }}</div>
       </template>
-      <template v-slot:custom="{item:{row,$index}}">
-        <el-radio label="1" v-model="row.flag">增加</el-radio>
-        <el-radio label="-1" v-model="row.flag">减少</el-radio>
-      </template>
+
       <template v-slot:operation="{item:{row,$index}}">
         <el-popconfirm
           v-if="dis"
@@ -78,7 +77,68 @@ export default {
       flag: 1,
       dis: true,
       details: {},
-      column: [
+      column: [],
+      isFront: JSON.parse(localStorage.getItem('supply_user')).isFront,
+      salesId: ''
+    }
+  },
+  computed: {
+    diffQty() {
+      return (row) => {
+        return Number(row.qty) - Number(row.refundQty)
+      }
+    }
+  },
+  created() {
+    if (this.detailsId) {
+      this.column = [
+        {
+          prop: 'materialName',
+          label: '产品名称',
+          width: '180'
+        },
+        {
+          prop: 'materialCode',
+          label: '物料编码',
+          width: '180'
+        },
+        {
+          prop: 'specification',
+          label: '规格型号',
+          width: '300'
+        },
+
+        {
+          prop: 'refundQty',
+          align: 'left',
+          label: '退货数量',
+          width: '180',
+          isInput: true
+        },
+        {
+          prop: 'notes',
+          label: '备注',
+          width: '180',
+          isInput: true,
+          type: 'text'
+        }
+      ]
+
+      detailRefund({ id: this.detailsId }).then(res => {
+        this.dataList = res.data.orders
+        this.details = res.data
+        this.dataList.forEach(k => {
+
+          k.refundQty = k.qty
+          k.diffQty = Number(k.qty) - Number(k.refundQty || 0)
+
+        })
+        this.details.customerOrderNo = res.data.customerOrderNo
+        this.customerNumber = res.data.materialId
+      })
+    } else {
+      Object.assign(this.$data, this.$options.data())
+      this.column = [
         {
           prop: 'materialName',
           label: '产品名称',
@@ -131,34 +191,7 @@ export default {
           isInput: true,
           type: 'text'
         }
-      ],
-      isFront: JSON.parse(localStorage.getItem('supply_user')).isFront,
-      salesId: ''
-    }
-  },
-  computed: {
-    diffQty() {
-      return (row) => {
-        return Number(row.qty) - Number(row.refundQty)
-      }
-    }
-  },
-  created() {
-    if (this.detailsId) {
-      detailRefund({ id: this.detailsId }).then(res => {
-        this.dataList = res.data.orders
-        this.details = res.data
-        this.dataList.forEach(k => {
-
-          k.refundQty=k.qty
-          k.diffQty = Number(k.qty) - Number(k.refundQty||0)
-
-        })
-        this.details.customerOrderNo =  res.data.customerOrderNo
-        this.customerNumber = res.data.materialId
-      })
-    } else {
-      Object.assign(this.$data, this.$options.data())
+      ]
     }
   },
 
@@ -175,14 +208,13 @@ export default {
     },
     confirm(selected) {
       // console.log(selected)
-      for (let i = 0; i <this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.length ; i++) {
+      for (let i = 0; i < this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.length; i++) {
         for (let j = 0; j < selected.length; j++) {
-          if ( this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i].id == selected[j].id){
+          if (this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i].id == selected[j].id) {
             // k.disabled = true
-            this.$set(this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i],'disabled',false)
-          }
-          else {
-            this.$set(this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i],'disabled',true)
+            this.$set(this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i], 'disabled', false)
+          } else {
+            this.$set(this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i], 'disabled', true)
 
           }
         }
@@ -203,9 +235,9 @@ export default {
     },
     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)
+      this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.find(k => {
+        if (k.id == item.id) {
+          this.$set(k, 'disabled', true)
           return
         }
       })
@@ -223,11 +255,11 @@ export default {
     delChange() {
       if (this.dataList.length) {
         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 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) {
               // k.disabled = true
-              this.$set(this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i],'disabled',true)
+              this.$set(this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i], 'disabled', true)
             }
 
           }
@@ -272,6 +304,37 @@ export default {
 
           // this.$parent.pageType = 0
           this.dis = false
+          this.column = [
+            {
+              prop: 'materialName',
+              label: '产品名称',
+              width: '180'
+            },
+            {
+              prop: 'materialCode',
+              label: '物料编码',
+              width: '180'
+            },
+            {
+              prop: 'specification',
+              label: '规格型号',
+              width: '300'
+            },
+            {
+              prop: 'refundQty',
+              align: 'left',
+              label: '退货数量',
+              width: '180',
+              isInput: true
+            },
+            {
+              prop: 'notes',
+              label: '备注',
+              width: '180',
+              isInput: true,
+              type: 'text'
+            }
+          ]
           this.$forceUpdate()
         })
 

src/views/supply/pickup/components/pickup_form.vue

@@ -434,7 +434,7 @@ export default {
     getPickupWayList() {
       getDictList({ sysDictEnum: 'PICK' }).then(res => {
         this.pickupWayList = res.data
-        if (this.isFront) {
+        if (this.isFront===true) {
           this.mainForm.pickupWay = '2'
           this.mainForm.logisticsId = '1574563841707114498'
           getCompanyList({
@@ -453,7 +453,7 @@ export default {
               })
             }
           })
-        }else {
+        }else if (this.isFront===false) {
           this.mainForm.pickupWay = '1'
 
         }