修改

src/views/layout/Layout.vue

@@ -16,10 +16,24 @@
           <i class="iconfont icon-computer_fill navIcon"></i>
           <p>透析管理</p>
         </div>
+<<<<<<< Updated upstream
         <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
           <i class="iconfont icon-kccx navIcon"></i>
           <p>采购管理</p>
         </div>
+=======
+<<<<<<< Updated upstream
+        <!-- <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
+          <i class="iconfont icon-kccx navIcon"></i>
+          <p>采购管理</p>
+        </div> -->
+=======
+       <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
+        <i class="iconfont icon-kccx navIcon"></i>
+         <p>采购管理</p>
+       </div>
+>>>>>>> Stashed changes
+>>>>>>> Stashed changes
         <div v-if="kucunShow" :class="index == 3 ? 'navOne navActive' : 'navOne'" @click="clickActive(3,'库房管理')">
           <i class="iconfont icon-kccx navIcon"></i>
           <p>库房管理</p>

src/xt_pages/supply/components/addSupply.vue

@@ -11,19 +11,19 @@
         ref="supplier"
       >
         <el-row>
-          <el-col span="6">
+          <el-col :span="6">
             <el-form-item label="供应商编码" prop="supplierCode">
               <el-input v-model="supplier.supplierCode"></el-input>
             </el-form-item>
           </el-col>
-          <el-col span="6">
+          <el-col :span="6">
             <el-form-item label="供应商名称" prop="supplierName">
               <el-input v-model="supplier.supplierName"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col span="6">
+          <el-col :span="6">
             <el-form-item label="供应商类别" prop="supplierType">
               <!-- <el-input v-model="supplier.type"></el-input> -->
               <!-- <el-autocomplete
@@ -43,7 +43,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col span="6">
+          <el-col :span="6">
             <el-form-item label="增值税税率" prop="vatRate">
               <el-input
                 v-model="supplier.vatRate"
@@ -53,19 +53,19 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col span="6">
+          <el-col :span="6">
             <el-form-item label="纳税人识别号" prop="number">
               <el-input v-model="supplier.number"></el-input>
             </el-form-item>
           </el-col>
-          <el-col span="6">
+          <el-col :span="6">
             <el-form-item label="开户银行" prop="bank">
               <el-input v-model="supplier.bank"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col span="6">
+          <el-col :span="6">
             <el-form-item label="银行账号" prop="bankAccount">
               <el-input v-model="supplier.bankAccount"></el-input>
             </el-form-item>
@@ -383,7 +383,6 @@ export default {
         .then((res) => {
           if (res.status == 200) {
             this.supplierType = res.data.data.list;
-            console.log(this.supplierType, "this.supplierType");
           }
         })
         .catch((err) => {
@@ -518,7 +517,6 @@ export default {
           //       address: val.address,
           //       phone: val.phone,
           //     };
-          //     this.$forceUpdate();
           //   }
         }
       });

src/xt_pages/supply/components/editGoodReturn.vue

@@ -59,8 +59,12 @@
           <span>单据编码:{{ number }}</span>
         </div>
         <div>
-          <el-button size="small" type="primary" @click="updateGoodReturn">保存</el-button>
-          <el-button size="small" type="primary" @click="checkReturnOrder">审核</el-button>
+          <el-button size="small" type="primary" @click="updateGoodReturn"
+            >保存</el-button
+          >
+          <el-button size="small" type="primary" @click="checkReturnOrder"
+            >审核</el-button
+          >
         </div>
       </div>
 
@@ -68,8 +72,8 @@
         <el-table
           :row-style="{ color: '#303133' }"
           :header-cell-style="{
-              backgroundColor: 'rgb(245, 247, 250)',
-              color: '#606266'
+            backgroundColor: 'rgb(245, 247, 250)',
+            color: '#606266',
           }"
           :data="recordInfo.tableList"
           :class="signAndWeighBoxPatients"
@@ -130,21 +134,30 @@
             </template>
           </el-table-column>
 
-        <el-table-column label="单位" align="center" width="120px">
+          <el-table-column label="单位" align="center" width="120px">
             <template slot="header" slot-scope="scope">
-                <span>单位<span style="color: red">*</span></span>
+              <span>单位<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
-              <el-form-item :prop="'tableList.' + scope.$index + '.supply_unit'" :rules='tableRules.supply_unit'>
-                <el-select v-model="scope.row.supply_unit" style="width:100px;" filterable placeholder="请选择"  :disabled="disabled">
-                        <!-- <el-option
+              <el-form-item
+                :prop="'tableList.' + scope.$index + '.supply_unit'"
+                :rules="tableRules.supply_unit"
+              >
+                <el-select
+                  v-model="scope.row.supply_unit"
+                  style="width: 100px"
+                  filterable
+                  placeholder="请选择"
+                  :disabled="disabled"
+                >
+                  <!-- <el-option
                             v-for="(item,index) in scope.row.unitList"
                             :key="index"
                             :label="item.name"
                             :value="item.name">
                         </el-option> -->
                 </el-select>
-              </el-form-item>  
+              </el-form-item>
             </template>
           </el-table-column>
           <el-table-column label="可用库存" align="center" width="130px">
@@ -168,7 +181,6 @@
           <el-table-column label="数量" align="center" width="120px">
             <template slot="header" slot-scope="scope">
               <span>数量<span style="color: red">*</span></span>
-
             </template>
             <template slot-scope="scope">
               <el-form-item
@@ -254,26 +266,43 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="操作" align="center" width="150px" fixed="right">
+          <el-table-column
+            label="操作"
+            align="center"
+            width="150px"
+            fixed="right"
+          >
             <template slot-scope="scope">
-              <el-tooltip class="item" effect="dark" content="新增" placement="top" >
-                  <el-button
-                      size="mini"
-                      type="primary"
-                      icon="el-icon-circle-plus-outline"
-                      @click="handleEdit(scope.$index, scope.row)">
-                  </el-button>
-            </el-tooltip>
-            <el-tooltip class="item" effect="dark" content="删除" placement="top">
-                  <el-button
-                      size="mini"
-                      type="danger"
-                      icon="el-icon-delete"
-                      @click="handleDelete(scope.$index, scope.row)">
-                  </el-button>
+              <el-tooltip
+                class="item"
+                effect="dark"
+                content="新增"
+                placement="top"
+              >
+                <el-button
+                  size="mini"
+                  type="primary"
+                  icon="el-icon-circle-plus-outline"
+                  @click="handleEdit(scope.$index, scope.row)"
+                >
+                </el-button>
+              </el-tooltip>
+              <el-tooltip
+                class="item"
+                effect="dark"
+                content="删除"
+                placement="top"
+              >
+                <el-button
+                  size="mini"
+                  type="danger"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.$index, scope.row)"
+                >
+                </el-button>
               </el-tooltip>
             </template>
-         </el-table-column>
+          </el-table-column>
         </el-table>
       </el-form>
       <div style="margin-top: 10px">
@@ -285,11 +314,14 @@
         >
         </el-input>
       </div>
+      <div style="margin-top: 10px">合计:{{ getAllPrice() }} 元</div>
       <div style="margin-top: 10px">
         <span
           >优惠率:<el-input
             style="width: 100px"
             v-model="rate_of_concession"
+            @input="addressChange"
+            placeholder="请输入优惠率"
           ></el-input
           >%</span
         >
@@ -298,6 +330,8 @@
           >优惠金额:<el-input
             style="width: 100px"
             v-model="discount_amount"
+            @input="count_discount"
+            placeholder="请输入优惠金额"
           ></el-input
         ></span>
 
@@ -305,6 +339,8 @@
           >本次付款:<el-input
             style="width: 100px"
             v-model="payment"
+            @input="count_payment"
+            placeholder="请输入本次付款"
           ></el-input
         ></span>
 
@@ -312,6 +348,8 @@
           >本次欠款:<el-input
             style="width: 100px"
             v-model="arrearage"
+            @input="count_arrearage"
+            placeholder="请输入本次欠款"
           ></el-input
         ></span>
       </div>
@@ -338,7 +376,7 @@ import {
   getInitOrder,
   getGoodReturnDetail,
   updateGoodReturn,
-  checkReturnOrder
+  checkReturnOrder,
 } from "@/api/supply";
 export default {
   name: "addPurchaseOrder",
@@ -347,7 +385,7 @@ export default {
   },
   data() {
     return {
-      tipsInfo:"",
+      tipsInfo: "",
       crumbs: [
         { path: false, name: "退货单" },
         { path: "/good/return/add", name: "新增退货单" },
@@ -381,8 +419,8 @@ export default {
       supplier_name: "",
       supplyList: [],
       rate_of_concession: "",
-      arrearage:"",
-      payment:"",
+      arrearage: "",
+      payment: "",
       discount_amount: "",
       tableRules: {
         name: [{ required: true, message: "商品不能为空", trigger: "blur" }],
@@ -399,8 +437,8 @@ export default {
       disabled: false,
       is_check: 0,
       dialogVisible: false,
-      return_remark:"",
-      warehouse_out_id:0,
+      return_remark: "",
+      warehouse_out_id: 0,
     };
   },
   methods: {
@@ -579,11 +617,11 @@ export default {
       tempObj["is_total"] = 1;
       tempObj["project_id"] = 0;
       tempObj["supply_unit"] = "";
-      tempObj["supply_batch_number"] = ""
-      tempObj["supply_product_date"] = ""
-      tempObj["supply_expiry_date"] = ""
-      tempObj["warehousing_id"] =0
-      tempObj["warehouse_info_id"] =0
+      tempObj["supply_batch_number"] = "";
+      tempObj["supply_product_date"] = "";
+      tempObj["supply_expiry_date"] = "";
+      tempObj["warehousing_id"] = 0;
+      tempObj["warehouse_info_id"] = 0;
       this.recordInfo.tableList.push(tempObj);
     },
     handleDelete: function (index, row) {
@@ -714,8 +752,34 @@ export default {
           this.recordInfo.tableList[i].supply_price *
           this.recordInfo.tableList[i].supply_count;
       }
+      this.total_price = total_price;
       return total_price.toFixed(2);
     },
+
+    addressChange() {
+      var discount_amount = 0;
+      if (this.rate_of_concession > 0) {
+        discount_amount = (
+          (this.rate_of_concession / 100) *
+          this.total_price
+        ).toFixed(2);
+      }
+      this.discount_amount = discount_amount;
+    },
+    count_discount() {
+      this.rate_of_concession = (
+        this.discount_amount /
+        (this.total_price * 0.01)
+      ).toFixed(2);
+    },
+    count_payment() {
+      this.arrearage = this.total_price - this.payment;
+    },
+
+    count_arrearage() {
+      this.payment = this.total_price - this.arrearage;
+    },
+
     checkPurchaseOrder(id, index) {
       this.$confirm("是否审核?", {
         confirmButtonText: "确 定",
@@ -734,123 +798,140 @@ export default {
         })
         .catch(() => {});
     },
-    getGoodReturnDetail(){
-      
-      var id = this.$route.query.id
-      getGoodReturnDetail(id).then(response=>{
-        if(response.data.state == 1){
-          var out = response.data.data.cancelDetail
-          console.log("out23322323232323",out)
-          this.warehouse_out_id = out.warehouse_out_id
-          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.discount_amount = out.discount_amount
-          this.payment = out.payment
-          this.arrearage = out.arrearage
-          this.start_time = this.getTimes(out.document_date)
-          var orderInfo = response.data.data.orderCancelDetail
-          console.log("orderINFO233232232332",orderInfo)
-          var drugList = response.data.data.drugList
-          var goodList = response.data.data.goodList
-          for(let i=0;i< orderInfo.length;i++){
-              
-              orderInfo[i].supply_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
-              orderInfo[i].project_id =  orderInfo[i].project_id
-              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_expiry_date =  orderInfo[i].supply_expiry_date
-              orderInfo[i].supply_product_date = orderInfo[i].supply_product_date
-            if(orderInfo[i].is_source == 1){
-              for(let j=0;j<drugList.length;j++){
-                  if( orderInfo[i].project_id == drugList[j].id){
-                    if(drugList[j].max_unit!=drugList[j].min_unit){
-                      orderInfo[i].unitList = [{id:1,name:""},{id:2,name:""}]
-                      orderInfo[i].unitList[0].name = drugList[j].max_unit
-                      orderInfo[i].unitList[1].name = drugList[j].min_unit
-                    }
-                    if(drugList[j].max_unit ==drugList[j].min_unit){
-                      orderInfo[i].unitList = [{id:1,name:""}]
-                      orderInfo[i].unitList[0].name = drugList[j].max_unit
-                    }
-                  
+    getGoodReturnDetail() {
+      var id = this.$route.query.id;
+      getGoodReturnDetail(id).then((response) => {
+        if (response.data.state == 1) {
+          var out = response.data.data.cancelDetail;
+          console.log("out23322323232323", out);
+          this.warehouse_out_id = out.warehouse_out_id;
+          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.discount_amount = out.discount_amount;
+          this.payment = out.payment;
+          this.arrearage = out.arrearage;
+          this.start_time = this.getTimes(out.document_date);
+          var orderInfo = response.data.data.orderCancelDetail;
+          console.log("orderINFO233232232332", orderInfo);
+          var drugList = response.data.data.drugList;
+          var goodList = response.data.data.goodList;
+          for (let i = 0; i < orderInfo.length; i++) {
+            orderInfo[i].supply_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;
+            orderInfo[i].project_id = orderInfo[i].project_id;
+            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_expiry_date = orderInfo[i].supply_expiry_date;
+            orderInfo[i].supply_product_date = orderInfo[i].supply_product_date;
+            if (orderInfo[i].is_source == 1) {
+              for (let j = 0; j < drugList.length; j++) {
+                if (orderInfo[i].project_id == drugList[j].id) {
+                  if (drugList[j].max_unit != drugList[j].min_unit) {
+                    orderInfo[i].unitList = [
+                      { id: 1, name: "" },
+                      { id: 2, name: "" },
+                    ];
+                    orderInfo[i].unitList[0].name = drugList[j].max_unit;
+                    orderInfo[i].unitList[1].name = drugList[j].min_unit;
                   }
-              }  
-              } 
-            if(orderInfo[i].is_source == 2){
-              for(let j=0;j<goodList.length;j++){
-                  if(orderInfo[i].project_id == goodList[j].id){
-                      orderInfo[i].unitList = [{id:1,name:""}]
-                      orderInfo[i].unitList[0].name = goodList[j].packing_unit
+                  if (drugList[j].max_unit == drugList[j].min_unit) {
+                    orderInfo[i].unitList = [{ id: 1, name: "" }];
+                    orderInfo[i].unitList[0].name = drugList[j].max_unit;
                   }
-              }  
-            } 
+                }
+              }
+            }
+            if (orderInfo[i].is_source == 2) {
+              for (let j = 0; j < goodList.length; j++) {
+                if (orderInfo[i].project_id == goodList[j].id) {
+                  orderInfo[i].unitList = [{ id: 1, name: "" }];
+                  orderInfo[i].unitList[0].name = goodList[j].packing_unit;
+                }
+              }
+            }
           }
-        
-          this.recordInfo.tableList= []
-          this.recordInfo.tableList = orderInfo
-        
+
+          this.recordInfo.tableList = [];
+          this.recordInfo.tableList = orderInfo;
         }
-      })  
+      });
     },
     toPrint() {
       var id = this.$route.query.id;
       this.$router.push({ path: "/purchase/order/print?&id=" + id });
     },
-    updateGoodReturn(){
+    updateGoodReturn() {
       var warehouse_out_id = this.$route.query.id;
-      this.$refs["tableForm"].validate((valid)=>{
-        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_price = this.recordInfo.tableList[i].supply_price.toString()
-            this.recordInfo.tableList[i].supply_total = this.recordInfo.tableList[i].supply_total.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(this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].id){
-                  this.recordInfo.tableList[i].supply_manufacturer = this.manufactuerList[j].manufacturer_name
-                }
+      this.$refs["tableForm"].validate((valid) => {
+        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_price =
+              this.recordInfo.tableList[i].supply_price.toString();
+            this.recordInfo.tableList[i].supply_total =
+              this.recordInfo.tableList[i].supply_total.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 (
+                this.recordInfo.tableList[i].supply_manufacturer ==
+                this.manufactuerList[j].id
+              ) {
+                this.recordInfo.tableList[i].supply_manufacturer =
+                  this.manufactuerList[j].manufacturer_name;
+              }
             }
           }
           var params = {
-            "stockIn":this.recordInfo.tableList,
-            "return_marke":this.return_remark,
-          }
-          console.log("start_time232233232",this.start_time)
-          console.log("arrage2323322323",this.arrearage)
-          updateGoodReturn(params,warehouse_out_id,this.start_time,this.rate_of_concession,this.discount_amount,this.arrearage,this.payment,this.supplier_name,this.number).then(response=>{
-            if(response.data.state == 1){
-               var msg = response.data.msg
-               this.loading = false
-               this.$message.success("保存成功!")
+            stockIn: this.recordInfo.tableList,
+            return_marke: this.return_remark,
+          };
+          console.log("start_time232233232", this.start_time);
+          console.log("arrage2323322323", this.arrearage);
+          updateGoodReturn(
+            params,
+            warehouse_out_id,
+            this.start_time,
+            this.rate_of_concession,
+            this.discount_amount,
+            this.arrearage,
+            this.payment,
+            this.supplier_name,
+            this.number
+          ).then((response) => {
+            if (response.data.state == 1) {
+              var msg = response.data.msg;
+              this.loading = false;
+              this.$message.success("保存成功!");
             }
-          })
+          });
         }
-      })
+      });
+    },
+    checkReturnOrder() {
+      var params = {
+        warehouse_out_id: this.warehouse_out_id,
+        id: this.id,
+      };
+      checkReturnOrder(params).then((response) => {});
     },
-    checkReturnOrder(){
-     var params = {
-       warehouse_out_id:this.warehouse_out_id,
-       id:this.id,
-     }
-     checkReturnOrder(params).then(response=>{
-       if(response.data.state == 1){
-        var msg = response.data.data.msg
-        this.$message.success("保存成功!")
-       }
-     })
-    }
   },
   created() {
     const tempObj = {};
@@ -870,11 +951,11 @@ export default {
     tempObj["is_total"] = 1;
     tempObj["project_id"] = 0;
     tempObj["supply_unit"] = "";
-    tempObj["supply_batch_number"] = ""
-    tempObj["supply_product_date"] = ""
-    tempObj["supply_expiry_date"] = ""
-    tempObj["warehousing_id"] =0
-    tempObj["warehouse_info_id"] =0
+    tempObj["supply_batch_number"] = "";
+    tempObj["supply_product_date"] = "";
+    tempObj["supply_expiry_date"] = "";
+    tempObj["warehousing_id"] = 0;
+    tempObj["warehouse_info_id"] = 0;
     this.recordInfo.tableList.push(tempObj);
     this.getInitOrder();
     //获取购货单列表

src/xt_pages/supply/supplyQuery.vue

@@ -213,7 +213,7 @@ export default {
       };
       getexporthistory(params).then((res) => {
         if (res.data.state == 1) {
-          console.log(res.data.data.list, "res.data.data.list");
+          
           this.tableList = res.data.data.list;
           this.total = res.data.data.total;
         }
@@ -225,7 +225,7 @@ export default {
         if (res.data.state == 1) {
           this.sType = res.data.data.list;
         }
-        console.log(res, "oo");
+        
       });
     },