zhouhao 2 éve
szülő
commit
ed1eb41485

+ 2 - 2
src/views/sales_control/adjust_warehouse.vue

@@ -91,7 +91,7 @@ export default {
             >
               查看
             </el-button>
-            {row.examineStatus != 'OK'||row.examineStatus != 'FAIL' ? (
+            {row.examineStatus != 'OK'&& row.examineStatus != 'FAIL' ? (
               <el-button
                 size="mini"
                 type="text" onClick={() => {
@@ -102,7 +102,7 @@ export default {
                 审批
               </el-button>
             ) : null}
-            {row.examineStatus != 'OK' ||row.examineStatus != 'FAIL'  ? (
+            {row.examineStatus != 'OK'&&row.examineStatus != 'FAIL'  ? (
             <el-popconfirm
               onOnConfirm={() => {
                 deleteCustomerStockOrder({ id: row.id }).then(res => {

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

@@ -318,8 +318,9 @@ export default {
 
                 }
               ]
-              // this.$parent.pageType = 0
-              this.salesId = res.data
+              if (this.isFront ===false){
+                this.$parent.pageType = 0
+              }              this.salesId = res.data
               this.$forceUpdate()
             })
 

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

@@ -62,7 +62,7 @@ export default {
           label: '规格型号',
           width: '300'
         },
-       
+
         {
           prop: 'qty',
           label: '已退数量',

+ 3 - 1
src/views/sales_control/sales_management/components/return_sales_form.vue

@@ -289,8 +289,10 @@ export default {
               type: 'text'
             }
           ]
+          if (this.isFront ===false){
+            this.$parent.pageType = 0
+          }
 
-          // this.$parent.pageType = 0
           this.dis = false
           this.$forceUpdate()
         })