Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/supply/components/addGoodReturn.vue

             v-show="showTwo"
             >保存</el-button
           >
-          <el-button size="small" type="primary" @click="checkReturnOrder">审核</el-button>
-          <!-- <el-button size="small" type="primary" @click="toPrint">打印</el-button>
-        <el-button size="small" type="primary" v-if="is_check == 2" @click="checkPurchaseOrder">审核</el-button>
-        <el-button size="small" type="primary" v-if="is_check == 1" @click="checkPurchaseOrder">反审核</el-button> -->
+          <el-button size="small" type="primary" v-if="is_check == 2" @click="checkReturnOrder">审核</el-button>
+          <el-button size="small" type="primary" v-if="is_check == 1" @click="modefyReturnOrder">反审核</el-button> 
         </div>
       </div>
 
   getGoodOrderDetail,
   saveGoodReturnOrder,
   checkReturnOrder,
-  updateGoodReturn
+  updateGoodReturn,
+  modefyReturnOrder
 } from "@/api/supply";
 export default {
   name: "addPurchaseOrder",
       dialogVisible: false,
       return_remark: "",
       warehouse_out_id:0,
+      showThree:false,
+      tableDataList:[],
     };
   },
   watch: {
       getGoodOrderDetail(id).then((response) => {
         if (response.data.state == 1) {
           var out = response.data.data.out;
-          this.is_check = out.is_check;
           this.id = out.id;
           this.supplier_name = out.supplier_id;
           this.rate_of_concession = out.rate_of_concession;
 
           this.recordInfo.tableList = [];
           this.recordInfo.tableList = orderInfo;
+          this.tableDataList = []
+          this.tableDataList = orderInfo
         }
       });
     },
 
             }
           } 
+           //判断是否在采购单数据中做了删除,如果长度相等则代表没有删除，如果不等则代表做了删除或者新增
+           if(this.recordInfo.tableList.length != this.tableDataList.length){
+             warehouse_out_id = 0
+             for(let i=0;i<this.recordInfo.tableList.length;i++){
+                this.recordInfo.tableList[i].id = 0
+                this.recordInfo.tableList[i].warehouse_info_id = 0
+                this.recordInfo.tableList[i].warehouse_out_id = 0
+                this.recordInfo.tableList[i].warehousing_id = 0
+                this.recordInfo.tableList[i].good_number = ""
+                 this.recordInfo.tableList[i].order_number = ""
+             }
+           }
            var params = {
             stockIn:this.recordInfo.tableList,
             return_marke:this.return_remark,
            }
            console.log("2323323232",params)
-         
+           return 
            saveGoodReturnOrder(params,warehouse_out_id,this.start_time,this.rate_of_concession,this.discount_amount,this.arrearage,this.payment,this.supplier_name).then(response=>{
              if(response.data.state == 1){
                 this.loading = false
                 this.showOne = false
                 this.showTwo = true
+                this.is_check = 2
                 this.$message.success("保存成功!")
                 var warehouseCancel = response.data.data.warehouseCancel
                 var out = response.data.data.cancelOrder
      checkReturnOrder(params).then(response=>{
        if(response.data.state == 1){
         this.loading = false
+        this.showThree = false
+        this.is_check = 1
         var msg = response.data.data.msg
         this.$message.success("保存成功!")
        }
      })
-    }
+    },
+    modefyReturnOrder() {
+      this.loading = true;
+      var params = {
+        warehouse_out_id: this.warehouse_out_id,
+        id: this.id,
+      };
+      modefyReturnOrder(params).then((response) => {
+        if (response.data.state == 1) {
+          this.loading = false;
+          var msg = response.data.data.msg;
+          this.$message.success("反审核成功!");
+          this.is_check = 2
+        }
+      });
+    },
    
   },
   created() {

src/xt_pages/supply/components/editGoodReturn.vue

     count_arrearage() {
       this.payment = this.total_price - this.arrearage;
     },
-
-    checkPurchaseOrder(id, index) {
-      this.$confirm("是否审核?", {
-        confirmButtonText: "确 定",
-        cancelButtonText: "取 消",
-        type: "warning",
-      })
-        .then(() => {
-          checkPurchaseOrder(this.id).then((response) => {
-            if (response.data.state == 1) {
-              var info = response.data.data.info;
-              this.disabled = true;
-              this.$message.success("审核成功!");
-              this.getPurchaseOrderDetail();
-            }
-          });
-        })
-        .catch(() => {});
-    },
     getGoodReturnDetail() {
       var id = this.$route.query.id;
       getGoodReturnDetail(id).then((response) => {
          
           if(msg == 1){
            this.$message.success("审核成功!");
+           this.is_check = 1
+           this.Reviewed = true
           }
           if(msg == 2){
             var good_name = response.data.data.good_name
             var specification_name = response.data.data.specification_name
-            var str = good_name +"*" + specification_name +"库存不足"+"审核失败"
+            var str = good_name +"*" + specification_name +"库存不足,审核失败!"
             this.$message.error(str)
 
           }
               var min_unit =  response.data.data.min_unit
               var max_unit =  response.data.data.max_unit
               var str = drug_name + " " + dose + dose_unit + "*" + min_number + min_unit+"/"+max_unit
-              this.$message.error(str + "库存不足")+"审核失败"
+              this.$message.error(str + "库存不足,审核失败!")
           }
-          
         }
       });
     },
           this.loading = false;
           var msg = response.data.data.msg;
           this.$message.success("反审核成功!");
+          this.Reviewed = false
         }
       });
     },

src/xt_pages/supply/goodOrderQuery.vue

                 icon="el-icon-delete"
                 size="small"
                 type="danger"
-                @click="toDelete(scope.row)"
+                @click="toDelete(scope.row,scope.row.$index)"
               >删除
               </el-button>
           </template>