Merge branch 'dev_v2' of ssh://gogs.zfire.top:2222/zfire-front/supply-front into dev_v2

src/views/sales_control/components/WarehouseDetails.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-page-header @back="$emit('close')" content="详情" style="padding: 20px 20px 0 20px"></el-page-header>
+    <el-page-header @back="handleBack" content="详情" style="padding: 20px 20px 0 20px"></el-page-header>
     <warehousing-header page-type="details" :details="details" />
     <sales-table :dataList="dataList" :column="column"> </sales-table>
     <div class="warehousing" v-if="details.approvalName">
@@ -101,6 +101,10 @@ export default {
         })
         this.dataList = res.data.orders
       })
+    },
+
+    handleBack() {
+      this.$emit('close')
     }
   }
 }

src/views/sales_control/components/WarehouseExamine.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-page-header @back="$emit('close')" content="审核" style="padding: 20px 20px 0 20px"></el-page-header>
+    <el-page-header @back="handleBack" content="审核" style="padding: 20px 20px 0 20px"></el-page-header>
     <warehousing-header page-type="examine" :details="details" />
     <sales-table :dataList="dataList" :column="column"> </sales-table>
     <div class="warehousing">
@@ -117,8 +117,11 @@ export default {
         approvalRemark: this.screenForm.approvalRemark
       }).then(res => {
         this.$successMsg(type === 'OK' ? '审核成功' : '驳回成功')
-        this.$emit('close')
+        this.handleBack()
       })
+    },
+    handleBack() {
+      this.$emit('close')
     }
   }
 }

src/views/sales_control/components/WarehouseForm.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-page-header @back="$emit('close')" content="新增" style="padding: 20px 20px 0 20px"></el-page-header>
+    <el-page-header @back="handleBack" content="新增" style="padding: 20px 20px 0 20px"></el-page-header>
     <warehousing-header ref="header" />
     <sales-table :dataList="dataList" :column="column" isOperation isSelection @handleSelection="handleSelection">
       <template #bts>
@@ -188,9 +188,12 @@ export default {
       }
       addCustomerStockOrder(params).then(res => {
         this.$successMsg('新增成功')
-        this.$emit('close')
         this.$forceUpdate()
+        this.handleBack()
       })
+    },
+    handleBack() {
+      this.$emit('close')
     }
   }
 }

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-page-header @back="$emit('close')" content="详情" style="padding: 20px 20px 0 20px"></el-page-header>
+    <el-page-header @back="handleBack" content="详情" style=" padding: 20px 20px 0 20px;"></el-page-header>
     <sales-header ref="header" />
     <sales-table :dataList="dataList" :column="column" @handleSelection="handleSelection">
       <template #events>
@@ -208,7 +208,7 @@ export default {
       }
       addFrontOrder(params).then(res => {
         this.$successMsg('新增成功')
-        this.$emit('close')
+        this.handleBack()
         this.$forceUpdate()
       })
     },
@@ -216,7 +216,8 @@ export default {
     handleInform(status = 2) {
       sbumitFrontOrder({ id: this.$refs.header.screenForm.id, status }).then(res => {
         this.$successMsg('发货通知')
-        this.$emit('close')
+        this.handleBack()
+
       })
     },
     handleSignIn(status) {
@@ -224,15 +225,21 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      })
-        .then(res => {
-          signIn({ id: this.$refs.header.screenForm.id, status }).then(res => {
-            this.$successMsg('签收')
-            this.$emit('close')
-          })
+      }).then(res => {
+        signIn({ id: this.$refs.header.screenForm.id, status }).then(res => {
+          this.$successMsg('签收')
+          this.handleBack()
+
         })
-        .catch(err => {})
-    }
+      }).catch(err => {
+
+      })
+
+    },
+    handleBack() {
+      this.$emit('close')
+    },
+
   }
 }
 </script>

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

@@ -1,9 +1,6 @@
 <template>
   <div>
-    <el-page-header
-      @back="$emit('close')"
-      :content="detailsId ? '编辑' : '新增'"
-      style="padding: 20px 20px 0 20px"
+    <el-page-header @back="handleBack" :content="detailsId?'编辑':'新增'" style=" padding: 20px 20px 0 20px;"
     ></el-page-header>
     <sales-header ref="header" />
     <sales-table
@@ -247,7 +244,7 @@ export default {
       console.log(33)
       sbumitFrontOrder({ id: this.salesId, status }).then(res => {
         this.$successMsg('通知发货')
-        this.$emit('close')
+        this.handleBack()
       })
     },
     handelSubmit(type, status = 1) {
@@ -312,17 +309,16 @@ export default {
                   type: 'text'
                 }
               ]
-              if (this.isFront === false) {
-                this.$emit('close')
-              }
-              this.salesId = res.data
-              this.$set(this.$refs.header.screenForm, 'id', res.data)
+              if (this.isFront ===false){
+                this.handleBack()
+              }              this.salesId = res.data
+              this.$set(this.$refs.header.screenForm,'id',res.data)
               this.$forceUpdate()
             })
           } else {
             updateFrontOrder(params).then(res => {
               this.$successMsg('编辑成功')
-              this.$emit('close')
+              this.handleBack()
               this.$forceUpdate()
             })
           }
@@ -335,7 +331,12 @@ export default {
     onReset() {
       Object.assign(this.$data, this.$options.data())
       Object.assign(this.$refs.header.$data, this.$refs.header.$options.data())
-    }
+
+    },
+    handleBack() {
+      this.$emit('close')
+    },
+
   }
 }
 </script>

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-page-header @back="$emit('close')" content="详情" style="padding: 20px 20px 0 20px"></el-page-header>
+    <el-page-header @back="handleBack" 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 #events>
@@ -131,7 +131,7 @@ export default {
     handleInform(status = 2) {
       sendRefund({ id: this.details.id, status }).then(res => {
         this.$successMsg('退货通知')
-        this.$emit('close')
+        this.handleBack()
       })
     },
     handelSubmit() {
@@ -145,10 +145,13 @@ export default {
       }
       addFrontOrder(params).then(res => {
         this.$successMsg('新增成功')
-        this.$emit('close')
+        this.handleBack()
         this.$forceUpdate()
       })
-    }
+    },
+    handleBack() {
+      this.$emit('close')
+    },
   }
 }
 </script>

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-page-header
-      @back="$emit('close')"
+      @back="handleBack"
       :content="detailsId ? '编辑' : '新增'"
       style="padding: 20px 20px 0 20px"
     ></el-page-header>
@@ -339,7 +339,7 @@ export default {
             }
           ]
           if (this.isFront === false) {
-            this.$emti('close')
+            this.handleBack()
           }
 
           this.dis = false
@@ -348,7 +348,7 @@ export default {
       } else {
         updateRefund(params).then(res => {
           this.$successMsg('编辑成功')
-          this.$emti('close')
+          this.handleBack()
           this.$forceUpdate()
         })
       }
@@ -356,10 +356,13 @@ export default {
     handleInform(status = 2) {
       sendRefund({ id: this.salesId, status }).then(res => {
         this.$successMsg('退货通知')
-        this.$emti('close')
+        this.handleBack()
       })
     },
-
+    
+    handleBack() {
+      this.$emit('close')
+    },
     onReset() {
       Object.assign(this.$data, this.$options.data())
     }

src/views/sales_control/sales_management/return_sales_list.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="width: 100%; height: 100%; overflow-y: auto">
     <template-page
-      v-if="!pageType"
+      v-show="!pageType"
       ref="pageRef"
       :getList="getList"
       :exportList="exportList"
@@ -10,13 +10,8 @@
       :optionsEvensGroup="optionsEvensGroup"
     >
     </template-page>
-    <return_sales_form
-      v-else-if="pageType === 1 || pageType === 2"
-      :details-id="detailsId"
-      :pageType="pageType"
-      @close="handleClose"
-    />
-    <return_sales_details v-else :details-id="detailsId" :pageType="pageType" @close="handleClose" />
+    <return_sales_form v-if="pageType === 1 || pageType === 2" :details-id="detailsId" :pageType="pageType" @close="handleClose"/>
+    <return_sales_details v-else :details-id="detailsId" :pageType="pageType" @close="handleClose"/>
   </div>
 </template>
 

src/views/stock_control/adjust_warehouse.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="width: 100%; height: 100%; overflow-y: auto">
     <template-page
-      v-if="!pageType"
+      v-show="!pageType"
       ref="pageRef"
       :getList="getList"
       :exportList="exportList"
@@ -10,9 +10,9 @@
       :optionsEvensGroup="optionsEvensGroup"
     >
     </template-page>
-    <warehouse-form v-else-if="pageType == 1" :pageType="pageType" @close="handleClose"/>
-    <warehouse-examine v-else-if="pageType == 2" :detailsId="detailsId" :pageType="pageType" @close="handleClose"/>
-    <warehouse-details v-else :detailsId="detailsId" :pageType="pageType" @close="handleClose"/>
+    <warehouse-form v-if="pageType == 1" :pageType="pageType" @close="handleClose" />
+    <warehouse-examine v-else-if="pageType == 2" :detailsId="detailsId" :pageType="pageType" @close="handleClose" />
+    <warehouse-details v-else :detailsId="detailsId" :pageType="pageType" @close="handleClose" />
   </div>
 </template>
 
@@ -71,10 +71,9 @@ export default {
     selectionChange(data) {
       this.recordSelected = data
     },
-    handleClose(){
+    handleClose() {
       this.pageType = 0
       this.$refs.pageRef.refreshList()
-
     },
     addWarehouse() {
       this.pageType = 1

src/views/stock_control/components/WarehouseDetails.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-page-header @back="pageType=0" content="详情" style=" padding: 20px 20px 0 20px;"></el-page-header>
+    <el-page-header @back="handleBack" content="详情" style=" padding: 20px 20px 0 20px;"></el-page-header>
     <warehousing-header page-type="details" :details="details" />
     <sales-table :dataList="dataList" :column="column">
     </sales-table>
@@ -101,6 +101,9 @@ export default {
         this.details = res.data
         this.dataList = res.data.orders
       })
+    },
+    handleBack() {
+      this.$emit('close')
     }
   }
 }

src/views/stock_control/components/WarehouseExamine.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-page-header @back="pageType=0" content="审核" style=" padding: 20px 20px 0 20px;"></el-page-header>
+    <el-page-header @back="handleBack" content="审核" style=" padding: 20px 20px 0 20px;"></el-page-header>
     <warehousing-header page-type="examine" :details="details" />
     <sales-table :dataList="dataList" :column="column">
     </sales-table>
@@ -122,8 +122,11 @@ export default {
         approvalRemark:this.screenForm.approvalRemark
       } ).then(res=>{
         this.$successMsg(type==='OK'?'审核成功':'驳回成功')
-        this.$emit('close')
+        this.handleBack()
       })
+    },
+    handleBack() {
+      this.$emit('close')
     }
   }
 }

src/views/stock_control/components/WarehouseForm.vue

@@ -1,11 +1,11 @@
 <template>
   <div>
-    <el-page-header @back="pageType=0" content="新增" style=" padding: 20px 20px 0 20px;"></el-page-header>
+    <el-page-header @back="handleBack" content="新增" style="padding: 20px 20px 0 20px"></el-page-header>
     <warehousing-header ref="header" />
     <sales-table :dataList="dataList" :column="column" isOperation isSelection @handleSelection="handleSelection">
       <template #bts>
         <div>
-          <el-button type="primary" size="mini" @click="dialogVisible=true">添加</el-button>
+          <el-button type="primary" size="mini" @click="dialogVisible = true">添加</el-button>
           <el-button type="danger" size="mini" @click="delChange">删除</el-button>
         </div>
       </template>
@@ -15,21 +15,22 @@
           <el-button size="mini">重置</el-button>
         </div>
       </template>
-      <template v-slot:custom="{item:{row,$index}}">
+      <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"
-          title="删除？"
-          @onConfirm="handleDel(row,$index)"
-        >
+      <template v-slot:operation="{ item: { row, $index } }">
+        <el-popconfirm style="margin-left: 10px" title="删除？" @onConfirm="handleDel(row, $index)">
           <el-button slot="reference" type="text" size="mini">删除</el-button>
         </el-popconfirm>
       </template>
     </sales-table>
-    <sales-dialog :dialogVisible="dialogVisible" :customerNumber="customerNumber" :func="getDialogList" @confirm="confirm" />
+    <sales-dialog
+      :dialogVisible="dialogVisible"
+      :customerNumber="customerNumber"
+      :func="getDialogList"
+      @confirm="confirm"
+    />
   </div>
 </template>
 
@@ -50,10 +51,10 @@ export default {
   data() {
     return {
       dialogVisible: false,
-      customerNumber:'',
+      customerNumber: '',
       dataList: [],
       selection: [],
-      flag:1,
+      flag: 1,
       column: [
         {
           prop: 'materialName',
@@ -80,7 +81,6 @@ export default {
           label: '发生方向',
           width: '180',
           isCustom: true
-
         },
         {
           prop: 'stockChangeQty',
@@ -93,7 +93,6 @@ export default {
           label: '备注',
           width: '180',
           isInput: true
-
         }
       ]
     }
@@ -109,7 +108,6 @@ export default {
       this.$refs.header.screenForm.customerNumber = this.dataList[0].customerNumber
       this.customerNumber = this.dataList[0].customerNumber
       this.dialogVisible = false
-
     },
     handleDel(item, index) {
       this.dataList.splice(index, 1)
@@ -138,15 +136,15 @@ export default {
       }
       addFrontOrder(params).then(res => {
         this.$successMsg('新增成功')
-        this.$emti('close')
+        this.handleBack()
         this.$forceUpdate()
       })
     },
-
+    handleBack() {
+      this.$emit('close')
+    }
   }
 }
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-page-header @back="pageType=0" content="详情" style=" padding: 20px 20px 0 20px;"></el-page-header>
+    <el-page-header @back="handleBack" content="详情" style=" padding: 20px 20px 0 20px;"></el-page-header>
     <sales-header ref="header" />
     <sales-table :dataList="dataList" :column="column"   @handleSelection="handleSelection">
       <!--      <template #bts>-->
@@ -216,7 +216,7 @@ export default {
       }
       addFrontOrder(params).then(res => {
         this.$successMsg('新增成功')
-        this.$emit('close')
+        this.handleBack()
         this.$forceUpdate()
       })
     },
@@ -235,8 +235,12 @@ export default {
       sbumitFrontOrder({ id: this.$refs.header.screenForm.id, status }).then(res => {
         this.$successMsg('退货通知')
       })
+    },
+     handleBack() {
+      this.$emit('close')
     }
 
+
   }
 }
 </script>

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-page-header @back="pageType=0" :content="detailsId?'编辑':'新增'" style=" padding: 20px 20px 0 20px;"
+    <el-page-header @back="handleBack" :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">
@@ -215,11 +215,14 @@ export default {
       } else {
         updateFrontOrder(params).then(res => {
           this.$successMsg('编辑成功')
-          this.$emit('close')
+          this.handleBack()
           this.$forceUpdate()
         })
 
       }
+    },
+    handleBack() {
+      this.$emit('close')
     }
 
   }

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-page-header @back="pageType=0" content="详情" style=" padding: 20px 20px 0 20px;"></el-page-header>
+    <el-page-header @back="handleBack" 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>
@@ -159,10 +159,13 @@ export default {
       }
       addFrontOrder(params).then(res => {
         this.$successMsg('新增成功')
-       this.$emit('close')
+      this.handleBack()
         this.$forceUpdate()
       })
-    }
+    },
+    handleBack(){
+      this.$emit('close')
+    },
 
   }
 }

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-page-header @back="pageType=0" :content="detailsId?'编辑':'新增'" style=" padding: 20px 20px 0 20px;"></el-page-header>
+    <el-page-header @back="handleBack" :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>
@@ -217,11 +217,14 @@ export default {
       }else {
         updateRefund(params).then(res=>{
           this.$successMsg('编辑成功')
-          this.$emit('close')
+          this.handleBack()
           this.$forceUpdate()
         })
       }
     },
+    handleBack(){
+      this.$emit('close')
+    },
     handleInform(status=2){
       sendRefund({id:this.$refs.header.details.id,status})
     }

src/views/stock_control/sales_management/customer_sales_list.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="width: 100%; height: 100%; overflow-y: auto">
     <template-page
-      v-if="!pageType"
+      v-show="!pageType"
       ref="pageRef"
       :getList="getList"
       :exportList="exportList"
@@ -10,7 +10,7 @@
       :optionsEvensGroup="optionsEvensGroup"
     >
     </template-page>
-    <customer_sales_form :detailsId="detailsId" v-else-if="pageType === 1 || pageType === 2" :pageType="pageType" @close="handleClose"/>
+    <customer_sales_form :detailsId="detailsId" v-if="pageType === 1 || pageType === 2" :pageType="pageType" @close="handleClose"/>
     <customer_sales_details :detailsId="detailsId" v-else :pageType="pageType" @close="handleClose"/>
   </div>
 </template>

src/views/stock_control/sales_management/return_sales_list.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="width: 100%; height: 100%; overflow-y: auto">
     <template-page
-      v-if="!pageType"
+      v-show="!pageType"
       ref="pageRef"
       :getList="getList"
       :exportList="exportList"
@@ -10,8 +10,13 @@
       :optionsEvensGroup="optionsEvensGroup"
     >
     </template-page>
-    <return_sales_form v-else-if="pageType === 1 || pageType === 2" :details-id="detailsId" :pageType="pageType" @close="handleClose"/>
-    <return_sales_details v-else :details-id="detailsId" :pageType="pageType" @close="handleClose"/>
+    <return_sales_form
+      v-if="pageType === 1 || pageType === 2"
+      :details-id="detailsId"
+      :pageType="pageType"
+      @close="handleClose"
+    />
+    <return_sales_details v-else :details-id="detailsId" :pageType="pageType" @close="handleClose" />
   </div>
 </template>
 
@@ -89,10 +94,10 @@ export default {
     selectionChange(data) {
       this.recordSelected = data
     },
-    handleClose(){
-      this.pageType =0
+    handleClose() {
+      console.log(999)
+      this.pageType = 0
       this.$refs.pageRef.refreshList()
-
     },
     operation() {
       return (h, { row, index, column }) => {