zhouhao 2 rokov pred
rodič
commit
29375517c5

+ 4 - 4
src/views/sales_control/sales_management/components/customer_sales_details.vue

@@ -10,12 +10,12 @@
       <!--        </div>-->
       <!--      </template>-->
       <template #events>
-        <div v-if="details.status==1">
+        <div v-if="details.status==1||details.status==2">
           <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 type="primary" size="mini" @click="handleInform(3)">发货</el-button>-->
+<!--        </div>-->
         <div v-if="details.status==3">
           <el-button size="mini">撤销发货</el-button>
         </div>

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

@@ -161,7 +161,7 @@ export default {
       console.log(this.$refs.dia)
       if (!this.dataList.length) {
         this.$nextTick(() => {
-          this.$refs.header.screenForm = {}
+          Object.assign(this.$refs.header.$data, this.$refs.header.$options.data())
           this.customerNumber = ''
         })
       }
@@ -179,7 +179,7 @@ export default {
         })
         if (this.dataList.length == 1) {
           this.$nextTick(() => {
-            this.$refs.header.screenForm = {}
+            Object.assign(this.$refs.header.$data, this.$refs.header.$options.data())
             this.customerNumber = ''
           })
         }
@@ -238,7 +238,7 @@ export default {
     },
     onReset(){
       Object.assign(this.$data, this.$options.data())
-      this.$refs.header.screenForm = {}
+      Object.assign(this.$refs.header.$data, this.$refs.header.$options.data())
 
     }
 

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

@@ -11,8 +11,8 @@
       </template>
       <template #events>
         <div>
-          <el-button type="primary" size="mini" @click="handleInform(2)">通知发货</el-button>
-          <el-button size="mini">撤销发货</el-button>
+          <el-button type="primary" v-if="details.status==1||details.status==2" size="mini" @click="handleInform(2)">通知发货</el-button>
+          <el-button size="mini" v-if="details.status==3">撤销发货</el-button>
         </div>
       </template>