调整

src/components/ReturnSalesHeader/ReturnSalesHeader.vue

@@ -4,7 +4,7 @@
       <el-row>
         <el-col :span="8" class="item">
           <div class="label">销售订单号</div>
-          <div class="value">
+          <div class="value" style="padding: 0">
             <el-input disabled v-model="details.customerOrderNo" placeholder="引用销售单"></el-input>
           </div>
         </el-col>
@@ -44,9 +44,9 @@
           <div class="label">发货仓库编码</div>
           <div class="value"></div>
         </el-col>
-        <el-col :span="8" class="item">
+        <el-col :span="details.id?8:24" class="item">
           <div class="label">发货仓库名称</div>
-          <div class="value">{{ details.stockType == 1 ? '前置仓' : '商家仓' }}</div>
+          <div class="value">{{ storeObj[details.stockType] || '' }}</div>
         </el-col>
         <el-col :span="24" class="item">
           <div class="label">退货备注</div>
@@ -69,7 +69,11 @@ export default {
     }
   },
   data() {
-    return {}
+    return {
+      storeObj: {
+        1: '前置仓', 2: '商家仓'
+      }
+    }
   },
   methods: {
     aa() {

src/components/SalesHeader/SalesHeader.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="sales">
-    <el-form :rules="rules" label-position="left" label-width="120px" :model="screenForm" size="mini">
+    <el-form :rules="rules" label-position="left" :disabled="screenForm.disabled" label-width="120px" :model="screenForm" size="mini">
       <el-row :gutter="20">
         <el-col :xs="24" :ms="6" :lg="6">
           <el-form-item label="销售订单号" prop="id">
@@ -40,11 +40,11 @@
             <el-select v-model="screenForm.stockType" placeholder="请选择" clearable>
               <el-option
                 label="前置仓"
-                value="1"
+                :value="1"
               />
               <el-option
                 label="商家仓"
-                value="2"
+                :value="2"
               />
             </el-select>
           </el-form-item>

src/layout/index.vue

@@ -85,7 +85,7 @@ export default {
   position: fixed;
   top: 0;
   right: 0;
-  z-index: 9;
+  z-index: 999;
   width: calc(100% - #{$sideBarWidth});
   transition: width 0.28s;
 }

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

@@ -165,6 +165,8 @@ export default {
         this.dataList = res.data.orders
         this.details = res.data
         this.$refs.header.screenForm = res.data
+        this.$refs.header.screenForm.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

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

@@ -16,7 +16,7 @@
           <el-button size="mini">重置</el-button>
           <el-button size="mini" :disabled="dis" @click="handleInform(2)">通知发货</el-button>
         </div>
-        <div v-else>
+        <div v-if="!disabled">
           <el-button type="primary" size="mini" @click="handelSubmit(2)">保存</el-button>
           <el-button size="mini">重置</el-button>
         </div>
@@ -62,6 +62,7 @@ export default {
       customerNumber: '',
       dataList: [],
       selection: [],
+      disabled:false,
       flag: 1,
       dis: true,
       column: [
@@ -105,7 +106,8 @@ export default {
           prop: 'notes',
           label: '备注',
           width: '180',
-          isInput: true
+          isInput: true,
+          type: 'text'
 
         }
       ]
@@ -116,12 +118,16 @@ export default {
       getFrontOrderDetail({ id: this.detailsId }).then(res => {
         this.dataList = res.data.orders
         this.$refs.header.screenForm = res.data
+        this.$refs.header.screenForm.disabled =this.disabled  = res.data.status !== 1?true:false
+
         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 ? '前置仓' : '商家仓'
       })
+    } else {
+      Object.assign(this.$data, this.$options.data())
     }
   },
   methods: {
@@ -130,7 +136,7 @@ export default {
       return getcustomerFrontList(...p)
     },
     confirm(selected) {
-      // console.log(selected)
+      console.log(selected)
       this.dataList = selected
       this.$refs.header.screenForm.customerName = this.dataList[0].customerName
       this.$refs.header.screenForm.customerNumber = this.dataList[0].customerNumber
@@ -186,7 +192,7 @@ export default {
         console.log(Number(this.dataList[i].qty))
 
         if (Number(this.dataList[i].qty) < 0 || !this.dataList[i].qty) {
-          this.$errorMsg(`第${i+1}产品数量有误`)
+          this.$errorMsg(`第${i + 1}产品数量有误`)
           return
         }
       }
@@ -201,7 +207,8 @@ export default {
         addFrontOrder(params).then(res => {
           this.$successMsg('新增成功')
           this.dis = false
-          this.$parent.pageType = 0
+          // this.$parent.pageType = 0
+
           this.$forceUpdate()
         })
 

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

@@ -143,7 +143,7 @@ export default {
     },
     handleInform(status = 2) {
       console.log(33)
-      sendRefund({ id: this.$refs.header.screenForm.id, status }).then(res => {
+      sendRefund({ id: this.details.id, status }).then(res => {
         this.$successMsg('退货通知')
 
       })

src/views/sales/sales_management/components/return_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>
     <return-sales-header ref="header" :details="details"/>
     <sales-table :dataList="dataList" :column="column" isOperation isSelection @handleSelection="handleSelection">
       <template #bts>
@@ -116,8 +116,8 @@ export default {
           prop: 'notes',
           label: '备注',
           width: '180',
-          isInput: true
-
+          isInput: true,
+          type:'text'
         }
       ]
     }
@@ -130,6 +130,8 @@ export default {
         this.details.customerOrderNo = this.dataList[0].id
         this.customerNumber=this.dataList[0].customerNumber
       })
+    }else{
+      Object.assign(this.$data, this.$options.data())
     }
   },
 
@@ -207,7 +209,7 @@ export default {
         params.id = ''
         addRefund(params).then(res => {
           this.$successMsg('新增成功')
-          this.$parent.pageType = 0
+          // this.$parent.pageType = 0
           this.dis =false
           this.$forceUpdate()
         })

src/views/sales/sales_management/customer_sales_list.vue

@@ -13,7 +13,7 @@
     >
     </template-page>
     <customer_sales_form :detailsId="detailsId" v-else-if="pageType===1 || pageType ===2" />
-    <customer_sales_details :detailsId="detailsId" v-else/>
+    <customer_sales_details :detailsId="detailsId" v-else />
   </div>
 </template>
 
@@ -23,25 +23,27 @@ import import_mixin from '@/components/template/import_mixin.js'
 import { delFrontOrder, exportCustomerFrontOrder, getFrontOrderList } from '@/api/sales'
 import customer_sales_form from '@/views/sales/sales_management/components/customer_sales_form'
 import customer_sales_details from '@/views/sales/sales_management/components/customer_sales_details'
+
 export default {
-  components: { TemplatePage, customer_sales_form,customer_sales_details },
+  components: { TemplatePage, customer_sales_form, customer_sales_details },
   mixins: [import_mixin],
   data() {
     return {
       pageType: 0,
-      detailsId:'',
+      detailsId: '',
       // 事件组合
       optionsEvensGroup: [
         [
           [
             {
               name: '新增',
-              click: ()=>{
+              click: () => {
                 this.pageType = 1
+                this.detailsId = ''
               }
             }
           ]
-        ],
+        ]
         // [
         //   [
         //     {
@@ -113,10 +115,10 @@ export default {
               编辑
             </el-button>
             <el-popconfirm
-              onOnConfirm = {()=>{
+              onOnConfirm={() => {
                 delFrontOrder({ id: row.id }).then(res => {
                   this.$successMsg('删除成功')
-                  this.$refs.pageRef.refreshList();
+                  this.$refs.pageRef.refreshList()
                 })
               }}
               title="删除吗？"

src/views/sales/sales_management/return_sales_list.vue

@@ -38,6 +38,7 @@ export default {
               name: '新增',
               click: ()=>{
                 this.pageType = 1
+                this.detailsId =''
               }
             }
           ]