退货单

src/components/SalesHeader/SalesHeader.vue

@@ -4,17 +4,17 @@
       <el-row :gutter="20">
         <el-col :xs="24" :ms="6" :lg="6">
           <el-form-item label="销售订单号" prop="id">
-            <el-input v-model="screenForm.id" placeholder="销售订单号" size="mini" />
+            <el-input v-model="screenForm.id" disabled placeholder="销售订单号" size="mini" />
           </el-form-item>
         </el-col>
         <el-col :xs="24" :ms="6" :lg="6">
           <el-form-item label="商家编号" prop="customerNumber">
-            <el-input v-model="screenForm.customerNumber" placeholder="商家编号" size="mini" />
+            <el-input v-model="screenForm.customerNumber" disabled placeholder="商家编号" size="mini" />
           </el-form-item>
         </el-col>
         <el-col :xs="24" :ms="6" :lg="6">
           <el-form-item label="商家名称" prop="customerName">
-            <el-input v-model="screenForm.customerName" placeholder="商家名称" size="mini" />
+            <el-input v-model="screenForm.customerName" disabled placeholder="商家名称" size="mini" />
           </el-form-item>
         </el-col>
         <el-col :xs="24" :ms="6" :lg="6">

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

@@ -11,15 +11,15 @@
       <!--      </template>-->
       <template #events>
         <div v-if="details.status==1 || details.status==2">
-          <el-button type="primary" size="mini" @click="handelSubmit">通知发货</el-button>
+          <el-button type="primary" size="mini" @click="handleInform(2)">通知发货</el-button>
           <el-button size="mini">撤销发货</el-button>
         </div>
         <div v-if="details.status==3">
-          <el-button type="primary" size="mini" @click="handelSubmit">发货</el-button>
+          <el-button type="primary" size="mini" @click="handleInform(3)">发货</el-button>
           <el-button size="mini">撤销发货</el-button>
         </div>
         <div v-if="details.status==4">
-          <el-button type="primary" size="mini" @click="handelSigning">签收</el-button>
+          <el-button type="primary" size="mini" @click="handleInform(4)">签收</el-button>
         </div>
       </template>
       <template v-slot:custom="{item:{row,$index}}">
@@ -35,43 +35,43 @@
           <el-button slot="reference" type="text" size="mini">删除</el-button>
         </el-popconfirm>
       </template>
-      <div>
-        <h5>物流信息</h5>
-        <div class="diy-table-1">
-          <el-row>
-            <el-col :span="6" class="item">
-              <div class="label">销售政策编号</div>
-              <div class="value">2222</div>
-            </el-col>
-            <el-col :span="6" class="item">
-              <div class="label">销售政策编号</div>
-              <div class="value">2222</div>
-            </el-col>
-            <el-col :span="6" class="item">
-              <div class="label">销售政策编号</div>
-              <div class="value">2222</div>
-            </el-col>
-            <el-col :span="6" class="item">
-              <div class="label">销售政策编号</div>
-              <div class="value">2222</div>
-            </el-col>
-            <el-col :span="24" class="item">
-              <div class="label">销售政策编号</div>
-              <div class="value">2222</div>
-            </el-col>
-          </el-row>
-        </div>
-        <el-timeline :reverse="reverse">
-          <el-timeline-item
-            v-for="(activity, index) in activities"
-            :key="index"
-            :timestamp="activity.timestamp"
-            :color="activity.color"
-          >
-            {{ activity.content }}
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <!--      <div>-->
+      <!--        <h5>物流信息</h5>-->
+      <!--        <div class="diy-table-1">-->
+      <!--          <el-row>-->
+      <!--            <el-col :span="6" class="item">-->
+      <!--              <div class="label">销售政策编号</div>-->
+      <!--              <div class="value">2222</div>-->
+      <!--            </el-col>-->
+      <!--            <el-col :span="6" class="item">-->
+      <!--              <div class="label">销售政策编号</div>-->
+      <!--              <div class="value">2222</div>-->
+      <!--            </el-col>-->
+      <!--            <el-col :span="6" class="item">-->
+      <!--              <div class="label">销售政策编号</div>-->
+      <!--              <div class="value">2222</div>-->
+      <!--            </el-col>-->
+      <!--            <el-col :span="6" class="item">-->
+      <!--              <div class="label">销售政策编号</div>-->
+      <!--              <div class="value">2222</div>-->
+      <!--            </el-col>-->
+      <!--            <el-col :span="24" class="item">-->
+      <!--              <div class="label">销售政策编号</div>-->
+      <!--              <div class="value">2222</div>-->
+      <!--            </el-col>-->
+      <!--          </el-row>-->
+      <!--        </div>-->
+      <!--        <el-timeline :reverse="reverse">-->
+      <!--          <el-timeline-item-->
+      <!--            v-for="(activity, index) in activities"-->
+      <!--            :key="index"-->
+      <!--            :timestamp="activity.timestamp"-->
+      <!--            :color="activity.color"-->
+      <!--          >-->
+      <!--            {{ activity.content }}-->
+      <!--          </el-timeline-item>-->
+      <!--        </el-timeline>-->
+      <!--      </div>-->
     </sales-table>
     <sales-dialog :dialogVisible="dialogVisible" :customerNumber="customerNumber" :func="getDialogList"
                   @confirm="confirm"
@@ -83,7 +83,7 @@
 import SalesDialog from '@/components/SalesDialog/SalesDialog'
 import SalesHeader from '@/components/SalesHeader/SalesHeader'
 import SalesTable from '@/components/SalesTable/SalesTable'
-import { addFrontOrder, getFrontOrderDetail } from '@/api/sales'
+import { addFrontOrder, getFrontOrderDetail, sbumitFrontOrder } from '@/api/sales'
 import { getcustomerFrontList } from '@/api/stock'
 
 export default {
@@ -167,6 +167,12 @@ export default {
         this.dataList = res.data.orders
         this.details = res.data
         this.$refs.header.screenForm = res.data
+        this.$refs.header.screenForm.provinceId = res.data.province
+        this.$refs.header.screenForm.cityId = res.data.city
+        this.$refs.header.screenForm.areaId = res.data.area
+        this.$refs.header.screenForm.streetId = res.data.street
+        this.$refs.header.screenForm.stockType = res.data.stockType == 1 ? '前置仓' : '商家仓'
+
       })
     }
   },
@@ -224,6 +230,12 @@ export default {
       }).catch(err => {
 
       })
+    },
+    handleInform(status = 2) {
+      console.log(33)
+      sbumitFrontOrder({ id: this.$refs.header.screenForm.id, status }).then(res => {
+        console.log(res)
+      })
     }
 
   }

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-page-header @back="$parent.pageType=0" content="新增" style=" padding: 20px 20px 0 20px;"></el-page-header>
+    <el-page-header @back="$parent.pageType=0" :content="detailsId?'编辑':'新增'" style=" padding: 20px 20px 0 20px;"></el-page-header>
     <sales-header ref="header" />
     <sales-table :dataList="dataList" :column="column" isOperation isSelection @handleSelection="handleSelection">
       <template #bts>
@@ -115,6 +115,11 @@ export default {
       getFrontOrderDetail({id:this.detailsId}).then(res=>{
         this.dataList = res.data.orders
         this.$refs.header.screenForm = res.data
+        this.$refs.header.screenForm.provinceId = res.data.province
+        this.$refs.header.screenForm.cityId = res.data.city
+        this.$refs.header.screenForm.areaId = res.data.area
+        this.$refs.header.screenForm.streetId = res.data.street
+        this.$refs.header.screenForm.stockType = res.data.stockType == 1 ? '前置仓' : '商家仓'
       })
     }
   },
@@ -166,6 +171,7 @@ export default {
         status:status
       }
       if (type==1){
+        params.id = ''
         addFrontOrder(params).then(res => {
           this.$successMsg('新增成功')
           this.dis = false

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

@@ -139,6 +139,7 @@ export default {
       this.dataList = selected
       console.log(this.dataList,selected,this.$refs.header)
       this.details = this.dataList[0]
+      this.details.id = this.dataList[0].id
        // this.$refs.header.details.customerName = this.dataList[0].customerName
        // this.$refs.header.details.customerNumber = this.dataList[0].customerNumber
        // this.$refs.header.details.customerNumber = this.dataList[0].pickTime
@@ -166,6 +167,7 @@ export default {
     },
 
     handelSubmit(type,status=1) {
+      const  id = this.dataList[0].id
       this.dataList.forEach(k => {
         k.id = ''
         k.directFlag = k.flag
@@ -173,9 +175,11 @@ export default {
       const params = {
         ...this.$refs.header.details,
         orders: this.dataList,
+        customerOrderNo:id,
         status
       }
       if (type===1){
+        params.id = ''
         addFrontOrder(params).then(res => {
           this.$successMsg('新增成功')
           this.$parent.pageType = 0