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

src/xt_pages/stock/drugs/drugStockInOrder.vue

             {{scope.row.warehousing_count}}{{scope.row.max_unit}}
           </template>
         </el-table-column>
-        <el-table-column label="拆零零售价" align="center">
+        <!-- <el-table-column label="拆零零售价" align="center">
           <template slot-scope="scope">
             {{scope.row.retail_price}}
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="进货价" align="center">
           <template slot-scope="scope">
             {{scope.row.price}}
         </el-table-column>
         <el-table-column label="总价" align="center">
           <template slot-scope="scope">
-            {{scope.row.total_price}}
+            <!-- {{scope.row.total_price}} -->
+            {{(scope.row.warehousing_count * scope.row.price).toFixed(2)}}
           </template>
         </el-table-column>
         <el-table-column label="生产厂家" align="center">

src/xt_pages/supply/components/addGoodOrder.vue

   getGoodOrderCountList,
   ModefySupplyWarehousing,
   MofyGoodOrder,
-  getSupplyWarehouseOutById
+  getSupplyWarehouseOutById,
+  UpdateSupplyWahouseingInfo
 } from "@/api/supply";
 export default {
   name: "addPurchaseOrder",
       getPurchaseOrderInfo(id, ids).then((response) => {
         if (response.data.state == 1) {
           var info = response.data.data.info;
-          
-         
-
+          console.log("采购订单ID")
           this.id = info.id;
           this.supplier_name = info.supplier_id;
           this.rate_of_concession = info.rate_of_concession;
     MofyGoodOrder() {
       var id = this.warese_out_id;
       console.log("采购单ID",id)
+      var warehousing_id = this.id
+      console.log("采购订单ID",warehousing_id)
       var params = {
         id: id,
+        warehousing_id:warehousing_id,
       };
       MofyGoodOrder(params).then((response) => {
         if (response.data.state == 1) {
             this.is_check = 2
             this.disabled = false
             this.Reviewed = false
-            return
+           
           }
           if (msg == 2) {
             var cancelList = response.data.data.cancelList
           var drugList = response.data.data.drugList;
           console.log("druglist23323223", drugList);
           var ids = "";
-          // 如果采购单没有数据，则代表改订单第一次生成采购订单数据
+          // 如果采购单没有数据，则代表改订单第一次生成采购订单数据,未入库
           if (goodOrder.length == 0) {
-            this.$router.push({path: "/good/order/add?id=" + this.id + "&ids=" + ids});
+             var is_warehouse = 2;
+             this.ModefySupplyWarehousing(is_warehouse, this.id);
+             return
           }
           for (let i = 0; i < purcaseOrder.length; i++) {
             for (let j = 0; j < drugList.length; j++) {
                   }
                 }
               }
-              //如果total的长度等于0,怎修改该订单的状态为全部入库
-
+            
+              console.log("arr233232233232",arr)
+             if (arr.length == 0) {
+                //未入库
+                var is_warehouse = 2;
+                this.ModefySupplyWarehousing(is_warehouse, this.id);
+                
+              }
               if (arr.length > 0) {
-                //修改采购订单的状态为全部入库
-                this.UpdateSupplyWahouseingInfo();
+                //部分入库
+                var is_warehouse = 3;
+                this.ModefySupplyWarehousing(is_warehouse, this.id);
               }
             }
           }
     },
     UpdateSupplyWahouseingInfo() {
       var params = {
-        warehousing_id: this.$route.query.warehousing_id,
+        warehousing_id: this.warehousing_id,
       };
       console.log("采购单ID",params)
       UpdateSupplyWahouseingInfo(params).then((response) => {

src/xt_pages/supply/components/addGoodReturn.vue

             v-model="supplier_name"
             style="width: 140px; margin-right: 10px"
             placeholder="请选择"
+            :disabled="disabled"
           >
             <el-option
               v-for="item in supplyList"
             align="right"
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
+            :disabled="disabled"
           ></el-date-picker>
          
           <span>单据编码:{{ number }}</span>
               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
-          <el-table-column label="折扣率" align="center" width="120px">
+          <el-table-column label="折扣率(%)" align="center" width="120px">
             <template slot-scope="scope">
-              {{ calculate(scope.row.supply_count * scope.row.supply_price) }}
+               <el-input
+                  v-model="scope.row.deposit_rate"
+                  style="width: 80px"
+                  :disabled="disabled"
+                ></el-input>
               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
 
           <el-table-column label="折扣金额" align="center" width="120px">
             <template slot-scope="scope">
-              {{ calculate(scope.row.supply_count * scope.row.supply_price) }}
+              {{ calculate(scope.row.supply_count * scope.row.supply_price * (scope.row.deposit_rate/100)) }}
               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
             </template>
           </el-table-column>
 
-          <el-table-column label="源采购单号" align="center" width="200px">
+          <el-table-column label="关联采购单号" align="center" width="200px">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.good_number"
         >
         </el-input>
       </div>
+       <!-- 审核水印 -->
+        <img
+          src="@/assets/purchase/Reviewed.png"
+          alt="正在加载..."
+          class="reviewImg"
+          v-show="Reviewed == true"
+        />
       <div style="margin-top: 10px">合计:{{ getAllPrice() }} 元</div>
       <div style="margin-top: 10px">
         <span
             v-model="rate_of_concession"
             @input="addressChange"
             placeholder="请输入优惠率"
+            :disabled="disabled"
           ></el-input
           >%</span
         >
             v-model="discount_amount"
             @input="count_discount"
             placeholder="请输入优惠金额"
+            :disabled="disabled"
           ></el-input
         ></span>
 
         <span
-          >本次付款:<el-input
+          >本次退款:<el-input
             style="width: 100px"
             v-model="payment"
             @input="count_payment"
-            placeholder="请输入本次付款"
+            placeholder="请输入本次退款"
+            :disabled="disabled"
           ></el-input
         ></span>
 
             v-model="arrearage"
             @input="count_arrearage"
             placeholder="请输入本次欠款"
+            :disabled="disabled"
           ></el-input
         ></span>
       </div>
     </div>
+    
   </div>
 </template>
 
       warehouse_out_id:0,
       showThree:false,
       tableDataList:[],
+      Reviewed:false,
     };
   },
   watch: {
             drugList[i].type = 1;
             drugList[i].supply_price = drugList[i].last_price;
             drugList[i].name = drugList[i].drug_name;
+            drugList[i].count = this.getWarehoseInfo(
+              drugList[i].drug_warehouse_info,
+              drugList[i].max_unit,
+              drugList[i].min_unit,
+              drugList[i].min_number
+            );
             drugList[i].unitList = [
               { id: 1, name: "" },
               { id: 2, name: "" },
             goodList[i].supply_total = this.getTotalStockCount(
               goodList[i].good_warehouse_info
             );
+            goodList[i].count = this.getTotalStockCount(
+              goodList[i].good_warehouse_info
+            );
             goodList[i].supply_count = "";
             goodList[i].supply_total_price = "";
             goodList[i].supply_manufacturer = goodList[i].manufacturer;
           this.recordInfo.tableList[i].is_total = val.is_total;
           this.recordInfo.tableList[i].supply_unit = val.supply_unit;
           this.recordInfo.tableList[i].unitList = val.unitList;
+          this.recordInfo.tableList[i].count = val.count
         }
       }
     },
       tempObj["warehouse_info_id"] =0
       tempObj["good_number"] = ""
       tempObj["min_price"] = "";
+      tempObj["deposit_rate"] = ""
       this.recordInfo.tableList.push(tempObj);
     },
     handleDelete: function (index, row) {
             orderInfo[i].supply_batch_number = orderInfo[i].supply_batch_number
             orderInfo[i].warehousing_id = orderInfo[i].warehousing_id
             orderInfo[i].warehouse_info_id = orderInfo[i].warehouse_info_id
+            orderInfo[i].deposit_rate = ""
             if (orderInfo[i].is_source == 1) {
               for (let j = 0; j < drugList.length; j++) {
                 if (orderInfo[i].project_id == drugList[j].id) {
         if(valid){
           this.loading = true
           for(let i=0;i<this.recordInfo.tableList.length;i++){
-             this.recordInfo.tableList[i].supply_count = parseInt(this.recordInfo.tableList[i].supply_count);
+            this.recordInfo.tableList[i].supply_count = parseInt(this.recordInfo.tableList[i].supply_count);
             this.recordInfo.tableList[i].supply_price =this.recordInfo.tableList[i].supply_price.toString();
             this.recordInfo.tableList[i].supply_total =this.recordInfo.tableList[i].supply_total.toString();
+            this.recordInfo.tableList[i].count =this.recordInfo.tableList[i].count.toString();
+            this.recordInfo.tableList[i].deposit_rate = this.recordInfo.tableList[i].deposit_rate.toString()
             if(this.recordInfo.tableList[i].supply_product_date == ""){
-              console.log("进来3323232")
               this.recordInfo.tableList[i].supply_product_date = 0
             }
             if(this.recordInfo.tableList[i].supply_expiry_date == ""){
                 this.arrearage = out.arrearage
                 this.start_time = this.getTimes(out.document_date)
                 var orderInfo = response.data.data.list
+                
                 for(let i=0;i< orderInfo.length;i++){
-                   orderInfo[i].supply_count =  orderInfo[i].count
+                  orderInfo[i].name = orderInfo[i].name
+                  orderInfo[i].id = orderInfo[i].id
+                  orderInfo[i].supply_count =  orderInfo[i].supply_count
                   orderInfo[i].supply_price =  orderInfo[i].price
                   orderInfo[i].supply_remake =  orderInfo[i].remark
                   orderInfo[i].type =  orderInfo[i].is_source
                   orderInfo[i].supply_unit =  orderInfo[i].supply_unit
                   orderInfo[i].order_number =  orderInfo[i].order_number
                   orderInfo[i].good_number = orderInfo[i].good_number
-                  orderInfo[i].supply_total_price = (orderInfo[i].count * orderInfo[i].price).toFixed(2)
+                  orderInfo[i].supply_total_price = (orderInfo[i].supply_count * orderInfo[i].price).toFixed(2)
                   orderInfo[i].supply_expiry_date = this.getTimes(orderInfo[i].supply_expiry_date)
                   orderInfo[i].supply_product_date = this.getTimes(orderInfo[i].supply_product_date)
+                  orderInfo[i].deposit_rate = orderInfo[i].deposit_rate
+                  orderInfo[i].count = orderInfo[i].count
+                  orderInfo[i].supply_total = orderInfo[i].supply_total
+                  orderInfo[i].supply_specification_name = orderInfo[i].supply_specification_name
                    if(orderInfo[i].is_source == 1){
                      for(let j=0;j<this.drugList.length;j++){
                         if(orderInfo[i].project_id == this.drugList[j].id){
                     }
                   }
                 }
+                console.log("oredereInof2332",orderInfo)
+                this.recordInfo.tableList = []
+                this.recordInfo.tableList = orderInfo
              }
            })
           
             this.recordInfo.tableList[i].supply_count = parseInt(this.recordInfo.tableList[i].supply_count)
             this.recordInfo.tableList[i].supply_price = this.recordInfo.tableList[i].supply_price.toString()
             this.recordInfo.tableList[i].supply_total = this.recordInfo.tableList[i].supply_total.toString()
-            
+            this.recordInfo.tableList[i].count =this.recordInfo.tableList[i].count.toString();
+            this.recordInfo.tableList[i].deposit_rate = this.recordInfo.tableList[i].deposit_rate.toString()
             for(let j=0;j<this.manufactuerList.length;j++){
                 if(this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].manufacturer_name){
                   this.recordInfo.tableList[i].manufacturer_id = this.manufactuerList[j].id
        if(response.data.state == 1){
         this.loading = false
         this.showThree = false
+        this.disabled = true
         this.is_check = 1
         var msg = response.data.data.msg
-        this.$message.success("保存成功!")
+        this.Reviewed = true
+        this.$message.success("审核成功!")
        }
      })
     },
           this.loading = false;
           var msg = response.data.data.msg;
           this.$message.success("反审核成功!");
+          this.disabled = false
           this.is_check = 2
+          this.Reviewed = false
         }
       });
     },
     tempObj["supply_expiry_date"] = ""
     tempObj["warehousing_id"] =0
     tempObj["warehouse_info_id"] =0
-    tempObj["count"] = 0;
+    tempObj["count"] = "";
     tempObj["good_number"] = ""
     tempObj["min_price"] = "";
+    tempObj["deposit_rate"] = ""
     this.recordInfo.tableList.push(tempObj);
-    console.log("即哪里地方2",this.recordInfo.tableList)
+   
     this.getInitOrder();
     if(parseInt(this.$route.query.id) > 0){
 

src/xt_pages/supply/components/addPurchaseOrder.vue

                   for (let j = 0; j < this.goodList.length; j++) {
                     if (orderInfo[i].project_id == this.goodList[j].id) {
                       orderInfo[i].unitList = [{ id: 1, name: "" }];
-                      orderInfo[i].unitList[0].name =
-                        this.goodList[j].packing_unit;
+                      orderInfo[i].unitList[0].name = this.goodList[j].packing_unit;
                     }
                   }
                 }
+                orderInfo[i].id = orderInfo[i].id
+                orderInfo[i].name = orderInfo[i].name
                 orderInfo[i].supply_count = orderInfo[i].count;
                 orderInfo[i].supply_price = orderInfo[i].price;
                 orderInfo[i].supply_remake = orderInfo[i].remark;
                 orderInfo[i].project_id = orderInfo[i].project_id;
                 orderInfo[i].supply_unit = orderInfo[i].supply_unit;
                 orderInfo[i].supply_specification_name = orderInfo[i].supply_specification_name
+                orderInfo[i].supply_total = orderInfo[i].supply_total
               }
 
               this.recordInfo.tableList = orderInfo;
               console.log("orderInfo2332322323232332",orderInfo)
-              for (let i = 0; i < orderInfo.length; i++) {
-                // orderInfo[i].name = "";
-                // orderInfo[i].supply_name = "";
-                // orderInfo[i].supply_specification_name = "";
-                if (orderInfo[i].is_source == 1) {
-                  for (let j = 0; j < this.drugList.length; j++) {
-                    if (orderInfo[i].project_id == this.drugList[j].id) {
-                      orderInfo[i].name = this.drugList[j].drug_name;
-                    }
-                  }
-                }
-                if (orderInfo[i].is_source == 2) {
-                  for (let y = 0; y < this.goodList.length; y++) {
-                    if ((orderInfo[i].project_id = this.goodList[y].id)) {
-                      orderInfo[i].name = this.goodList[y].good_name;
-                    }
-                  }
-                }
-              }
+              // for (let i = 0; i < orderInfo.length; i++) {
+              //   orderInfo[i].name = "";
+              //   orderInfo[i].supply_name = "";
+              //   orderInfo[i].supply_specification_name = "";
+              //   if (orderInfo[i].is_source == 1) {
+              //     for (let j = 0; j < this.drugList.length; j++) {
+              //       if (orderInfo[i].project_id == this.drugList[j].id) {
+              //         orderInfo[i].name = this.drugList[j].drug_name;
+              //       }
+              //     }
+              //   }
+              //   if (orderInfo[i].is_source == 2) {
+              //     for (let y = 0; y < this.goodList.length; y++) {
+              //       if ((orderInfo[i].project_id = this.goodList[y].id)) {
+              //         orderInfo[i].name = this.goodList[y].good_name;
+              //       }
+              //     }
+              //   }
+              // }
               this.showTwo = false;
               this.showOne = true;
               this.showThree = true

src/xt_pages/supply/components/editGoodOrder.vue

           this.number = out.number;
           this.good_number = out.good_number;
           this.return_remark = out.return_remake;
+          
           this.start_time = this.getTimes(out.document_date);
           var orderInfo = response.data.data.list;
 
             this.Reviewed = false
             this.showOne = true
             this.showTwo = false
-            return
           }
           if (msg == 2) {
             var cancelList = response.data.data.cancelList;
           var drugList = response.data.data.drugList;
           console.log("druglist23323223", drugList);
           var ids = "";
-          // 如果采购单没有数据，则代表改订单第一次生成采购订单数据
+          // 如果采购单没有数据，则代表改订单第一次生成采购订单数据,未入库
           if (goodOrder.length == 0) {
-            this.$router.push({
-              path: "/good/order/add?id=" + id + "&ids=" + ids,
-            });
+              var is_warehouse = 2;
+              this.ModefySupplyWarehousing(is_warehouse, this.$route.query.warehousing_id);
+              return
           }
           for (let i = 0; i < purcaseOrder.length; i++) {
             for (let j = 0; j < drugList.length; j++) {
                   }
                 }
               }
-              //如果total的长度等于0,怎修改该订单的状态为全部入库
-
+              //如果长度等于0,怎修改该订单的状态未入库
+              console.log("arr233232233232",arr)
+              if(arr.length == 0){
+                var is_warehouse = 2;
+                this.ModefySupplyWarehousing(is_warehouse, this.$route.query.warehousing_id);
+                return
+              }
               if (arr.length > 0) {
-                //修改采购订单的状态为全部入库
-                this.UpdateSupplyWahouseingInfo();
+                //修改采购订单的状态为部分入库
+                var is_warehouse = 3;
+                this.ModefySupplyWarehousing(is_warehouse, this.$route.query.warehousing_id);
               }
             }
           }

src/xt_pages/supply/components/editGoodReturn.vue

             v-model="supplier_name"
             style="width: 140px; margin-right: 10px"
             placeholder="请选择"
-            @change="changeTypeName"
           >
             <el-option
               v-for="item in supplyList"
             align="right"
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
-            @change="startTimeChange"
           ></el-date-picker>
           <!-- <span>交货日期:</span>
         <el-date-picker
           </el-table-column>
           <el-table-column label="折扣率" align="center" width="120px">
             <template slot-scope="scope">
-              {{ calculate(scope.row.supply_count * scope.row.supply_price) }}
+               <el-input
+                  v-model="scope.row.deposit_rate"
+                  style="width: 80px"
+                  :disabled="disabled"
+                ></el-input>
               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
 
-          <el-table-column label="折扣金额" align="center" width="120px">
+           <el-table-column label="折扣金额" align="center" width="120px">
             <template slot-scope="scope">
-              {{ calculate(scope.row.supply_count * scope.row.supply_price) }}
+              {{ calculate(scope.row.supply_count * scope.row.supply_price * (scope.row.deposit_rate/100)) }}
               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
 
+
           <el-table-column label="生产厂家" align="center" width="200px">
             <template slot-scope="scope">
               <el-input
             </template>
           </el-table-column>
 
-          <el-table-column label="源采购单号" align="center" width="200px">
+          <el-table-column label="关联采购单号" align="center" width="200px">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.good_number"
         ></span>
 
         <span
-          >本次付款:<el-input
+          >本次退款:<el-input
             style="width: 100px"
             v-model="payment"
             @input="count_payment"
-            placeholder="请输入本次付款"
+            placeholder="请输入本次退款"
           ></el-input
         ></span>
 
               drugList[i].min_unit,
               drugList[i].min_number
             );
+            drugList[i].count = this.getWarehoseInfo(
+              drugList[i].drug_warehouse_info,
+              drugList[i].max_unit,
+              drugList[i].min_unit,
+              drugList[i].min_number
+            );
             drugList[i].supply_count = "";
             drugList[i].supply_total_price = "";
             drugList[i].supply_manufacturer = drugList[i].manufacturer;
             goodList[i].supply_total = this.getTotalStockCount(
               goodList[i].good_warehouse_info
             );
+            goodList[i].count = this.getTotalStockCount(
+              goodList[i].good_warehouse_info
+            );
             goodList[i].supply_count = "";
             goodList[i].supply_total_price = "";
             goodList[i].supply_manufacturer = goodList[i].manufacturer;
           this.recordInfo.tableList[i].is_total = val.is_total;
           this.recordInfo.tableList[i].supply_unit = val.supply_unit;
           this.recordInfo.tableList[i].unitList = val.unitList;
+          this.recordInfo.tableList[i].count = val.count
         }
       }
     },
       tempObj["count"] = "";
       tempObj["min_price"] = "";
       tempObj["good_number"] = ""
+      tempObj["deposit_rate"] = ""
       this.recordInfo.tableList.push(tempObj);
     },
     handleDelete: function (index, row) {
           var goodList = response.data.data.goodList;
           for (let i = 0; i < orderInfo.length; i++) {
             orderInfo[i].id = orderInfo[i].id;
-            orderInfo[i].supply_count = orderInfo[i].count;
-            orderInfo[i].count = orderInfo[i].source_count;
+            orderInfo[i].supply_count = orderInfo[i].supply_count;
+            orderInfo[i].count = orderInfo[i].count;
+
             orderInfo[i].supply_price = orderInfo[i].price;
             orderInfo[i].supply_remake = orderInfo[i].remark;
             orderInfo[i].type = orderInfo[i].is_source;
               this.recordInfo.tableList[i].supply_count
             );
             this.recordInfo.tableList[i].supply_price =
-              this.recordInfo.tableList[i].supply_price.toString();
+            this.recordInfo.tableList[i].supply_price.toString();
             this.recordInfo.tableList[i].supply_total =
-              this.recordInfo.tableList[i].supply_total.toString();
+            this.recordInfo.tableList[i].supply_total.toString();
+            this.recordInfo.tableList[i].count = this.recordInfo.tableList[i].count.toString()
+            this.recordInfo.tableList[i].deposit_rate = this.recordInfo.tableList[i].deposit_rate.toString()
             for (let j = 0; j < this.manufactuerList.length; j++) {
               if (
                 this.recordInfo.tableList[i].supply_manufacturer ==
            this.$message.success("审核成功!");
            this.is_check = 1
            this.Reviewed = true
+           this.disabled = true
           }
           if(msg == 2){
             var good_name = response.data.data.good_name
           var msg = response.data.data.msg;
           this.$message.success("反审核成功!");
           this.Reviewed = false
+          this.disabled = false
+          this.is_check = 2
         }
       });
     },
     tempObj["count"] = "";
     tempObj["min_price"] = "";
     tempObj["good_number"] = ""
+    tempObj["deposit_rate"] = ""
     this.recordInfo.tableList.push(tempObj);
     this.getInitOrder();
     //获取购货单列表

src/xt_pages/supply/goodreturn.vue

               <span>{{getName(scope.row.supplier_id)}}</span>
             </template>
          </el-table-column>
-        <el-table-column label="关联购货订单号" align="center" width="200">
+        <el-table-column label="关联采购订单号" align="center" width="200">
           <template slot-scope="scope">
             <span v-if="scope.row.cancelOrder!=undefined && scope.row.cancelOrder.length >0">{{scope.row.cancelOrder[0].order_number}}</span>
           </template>
         </el-table-column>
-           <el-table-column label="源采购单号" align="center" width="200">
+           <el-table-column label="关联采购单号" align="center" width="200">
           <template slot-scope="scope">
              <span v-if="scope.row.cancelOrder!=undefined && scope.row.cancelOrder.length >0">{{scope.row.cancelOrder[0].good_number}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="购货金额" align="center" width="200">
+        <el-table-column label="采购金额" align="center" width="200">
           <template slot-scope="scope">
              <span v-if="getAllBuyPrice(scope.row.cancelOrder)>0">{{getAllBuyPrice(scope.row.cancelOrder)}}</span> 
           </template>
          </template>
        </el-table-column>
 
-       <el-table-column label="付款状态" align="center" width="200">
+       <el-table-column label="退款状态" align="center" width="200">
          <template slot-scope="scope">
            <!-- <span v-if="scope.row.is_check == 2">未审核</span>
            <span v-if="scope.row.is_check == 1">已审核</span> -->