采购

src/views/layout/Layout.vue

@@ -19,8 +19,8 @@
 
        <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
          <i class="iconfont icon-kccx navIcon"></i>
-        <p>采购管理</p>
-       </div>
+         <p>采购管理</p>
+      </div>
 
         <div v-if="kucunShow" :class="index == 3 ? 'navOne navActive' : 'navOne'" @click="clickActive(3,'库房管理')">
           <i class="iconfont icon-kccx navIcon"></i>

src/xt_pages/supply/components/addGoodOrder.vue

@@ -16,7 +16,7 @@
           <span style="color: red">*</span><span>供应商:</span>
           <el-select
             v-model="supplier_name"
-            style="width: 140px; margin-right: 10px"
+            style="width: 220px; margin-right: 10px"
             placeholder="请选择"
             :disabled="disabled"
           >
@@ -396,6 +396,13 @@
           >
           </el-input>
         </div>
+         <!-- 审核水印 -->
+        <img
+          src="@/assets/purchase/Reviewed.png"
+          alt="正在加载..."
+          class="reviewImg"
+          v-show="Reviewed == true"
+        />
       </el-form>
       <div>
         <div style="margin-top: 10px">合计:{{ getAllPrice() }} 元</div>
@@ -484,6 +491,7 @@ export default {
   },
   data() {
     return {
+      Reviewed: false,
       crumbs: [
         { path: false, name: "采购单" },
         { path: "/supply/good/order/query", name: "新增采购单" },
@@ -562,6 +570,7 @@ export default {
     total_price: function (newval, oldval) {
       if(this.rate_of_concession != ""){
         this.addressChange()
+        this.count_payment()
       }
     }
   },
@@ -845,13 +854,15 @@ export default {
         ).toFixed(2);
       }
       this.discount_amount = discount_amount;
-     
+      if(this.payment > 0) this.count_payment()
+      
     },
     count_discount() {
       this.rate_of_concession = (
         this.discount_amount /
         (this.total_price * 0.01)
       ).toFixed(2);
+      if(this.payment > 0) this.count_payment()
     },
     count_payment() {
       let arrearage_1 = (this.total_price - this.discount_amount - this.payment).toFixed(2);
@@ -1153,6 +1164,7 @@ export default {
       getGoodOrderCountList(id, warehousing_id).then((response) => {
         if (response.data.state == 1) {
           this.$message.success("审核成功!");
+          this.Reviewed = true;
           this.disabled = true
           this.is_check = 1
           this.showOne = false;
@@ -1545,9 +1557,32 @@ export default {
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>
+.reviewImg {
+  position: fixed;
+  left: 50%;
+  transform: translateX(-50%);
+  top: 30%;
+}
+
+/deep/ .el-table--scrollable-x .el-table__body-wrapper {
+  overflow: auto;
+}
+/deep/ .gutter {
+  width: 15px !important;
+  display: inline-block !important;
+}
+/deep/ .el-table__fixed-right-patch {
+  width: 15px !important;
+}
+
+/deep/ .el-table__fixed-right {
+  bottom: 0 !important;
+  left: auto;
+  right: 0;
+}
 /deep/ .el-table__body-wrapper::-webkit-scrollbar {
-  width: 10px;
-  height: 10px;
+  width: 15px !important;
+  height: 15px !important;
 }
 .information {
   border: 1px #dcdfe6 solid;
@@ -1598,10 +1633,10 @@ export default {
 .el-table::before {
   background-color: #d0d3da;
 }
-.el-table__fixed-right {
+/* .el-table__fixed-right {
   width: 150px;
   bottom: 20px;
   height: 100%;
-}
+} */
 
 </style>

src/xt_pages/supply/components/addGoodReturn.vue

@@ -16,7 +16,7 @@
           <span style="color: red">*</span><span>供应商:</span>
           <el-select
             v-model="supplier_name"
-            style="width: 140px; margin-right: 10px"
+            style="width: 220px; margin-right: 10px"
             placeholder="请选择"
             :disabled="disabled"
           >
@@ -1305,6 +1305,13 @@ export default {
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>
+
+.reviewImg {
+  position: fixed;
+  left: 50%;
+  transform: translateX(-50%);
+  top: 30%;
+}
 .information {
   border: 1px #dcdfe6 solid;
   padding: 30px 20px 30px 20px;
@@ -1330,9 +1337,25 @@ export default {
   margin-bottom: 15px;
 }
 
+/deep/ .el-table--scrollable-x .el-table__body-wrapper {
+  overflow: auto;
+}
+/deep/ .gutter {
+  width: 15px !important;
+  display: inline-block !important;
+}
+/deep/ .el-table__fixed-right-patch {
+  width: 15px !important;
+}
+
+/deep/ .el-table__fixed-right {
+  bottom: 0 !important;
+  left: auto;
+  right: 0;
+}
 /deep/ .el-table__body-wrapper::-webkit-scrollbar {
-  width: 10px;
-  height: 10px;
+  width: 15px !important;
+  height: 15px !important;
 }
 </style>
 
@@ -1359,9 +1382,11 @@ export default {
 .el-table::before {
   background-color: #d0d3da;
 }
-.el-table__fixed-right {
+/* .el-table__fixed-right {
   width: 150px;
   bottom: 20px;
   height: 100%;
 }
+ */
+
 </style>

src/xt_pages/supply/components/addPurchaseOrder.vue

@@ -16,7 +16,7 @@
           <span style="color: red">*</span><span>供应商:</span>
           <el-select
             v-model="supplier_name"
-            style="width: 140px; margin-right: 10px"
+            style="width: 220px; margin-right: 10px"
             placeholder="请选择"
           >
             <el-option
@@ -1143,10 +1143,25 @@ export default {
   transform: translateX(-50%);
   top: 30%;
 }
+/deep/ .el-table--scrollable-x .el-table__body-wrapper {
+  overflow: auto;
+}
+/deep/ .gutter {
+  width: 15px !important;
+  display: inline-block !important;
+}
+/deep/ .el-table__fixed-right-patch {
+  width: 15px !important;
+}
 
+/deep/ .el-table__fixed-right {
+  bottom: 0 !important;
+  left: auto;
+  right: 0;
+}
 /deep/ .el-table__body-wrapper::-webkit-scrollbar {
-  width: 10px;
-  height: 10px;
+  width: 15px !important;
+  height: 15px !important;
 }
 </style>
 
@@ -1173,9 +1188,9 @@ export default {
 .el-table::before {
   background-color: #d0d3da;
 }
-.el-table__fixed-right {
+/* .el-table__fixed-right {
   width: 150px;
   bottom: 20px;
   height: 100%;
-}
+} */
 </style>

src/xt_pages/supply/components/addSupply.vue

@@ -1,5 +1,10 @@
 <template>
-  <el-dialog :title="title" :visible.sync="dialogVisible" width="40%" :before-close="closePop" >
+  <el-dialog
+    :title="title"
+    :visible.sync="dialogVisible"
+    width="40%"
+    :before-close="closePop"
+  >
     <!-- :before-close="handleClose" 如需要可添加进上方 -->
     <div>
       <el-form
@@ -32,10 +37,7 @@
                 @select="handleSelect"
               ></el-autocomplete> -->
 
-              <el-select
-                v-model="supplier.supplierType"
-                @select="handleSelect"
-              >
+              <el-select v-model="supplier.supplierType" @select="handleSelect">
                 <el-option
                   v-for="item in supplierType"
                   :key="item.name"
@@ -51,7 +53,8 @@
               <el-input
                 v-model="supplier.vatRate"
                 @keyup.native="supplier.vatRate = oninput(supplier.vatRate)"
-              ></el-input>%
+              ></el-input
+              >%
             </el-form-item>
           </el-col>
         </el-row>
@@ -318,9 +321,9 @@ export default {
         this.title = "编辑供应商";
         this.supplier.supplierCode = data.SupplierCode;
         this.supplier.supplierName = data.SupplierName;
-        if (data.SupplierType == 0){
-          this.supplier.supplierType = ""
-        }else {
+        if (data.SupplierType == 0) {
+          this.supplier.supplierType = "";
+        } else {
           this.supplier.supplierType = data.SupplierType;
         }
         this.supplier.vatRate = data.VatRate;
@@ -432,7 +435,7 @@ export default {
                     this.closePop();
                     this.$emit("init");
                   } else {
-                    this.$message.error("新增失败："+res.data.msg);
+                    this.$message.error("新增失败：" + res.data.msg);
                     setTimeout(() => {
                       this.closePop();
                     }, 2000);
@@ -480,7 +483,7 @@ export default {
                     this.closePop();
                     this.$emit("init");
                   } else {
-                    this.$message.error("修改失败："+res.data.msg);
+                    this.$message.error("修改失败：" + res.data.msg);
                     setTimeout(() => {
                       this.closePop();
                     }, 2000);
@@ -565,9 +568,9 @@ export default {
       let params = {
         id: data.id,
       };
-      if (params.id==undefined||params.id=="undefined") {
+      if (params.id == undefined || params.id == "undefined") {
         this.recordInfo.contacts.splice(index, 1);
-      }else {
+      } else {
         if (this.show_type == 1) {
           if (this.recordInfo.contacts.length <= 1) {
             return;
@@ -577,7 +580,7 @@ export default {
         } else if (this.show_type == 2) {
           delcontactone(params).then((res) => {
             if (res.data.state == 1) {
-              this.$message.success("删除成功!!:",index);
+              this.$message.success("删除成功!!:", index);
               this.getcontacts(this.supplier_ids);
             } else {
               this.$message.error(res.data.data.list);
@@ -661,12 +664,26 @@ export default {
 /deep/ .el-form-item__error {
   // display: none !important;
 }
-/deep/ .el-table__body-wrapper::-webkit-scrollbar {
-  width: 10px;
-  height: 10px;
+// /deep/ .el-table__body-wrapper::-webkit-scrollbar {
+//   width: 10px;
+//   height: 10px;
+// }
+
+
+/deep/ .el-table--scrollable-x .el-table__body-wrapper {
+  overflow: auto;
+}
+/deep/ .gutter {
+  width: 22px !important;
+  display: inline-block !important;
+}
+/deep/ .el-table__fixed-right-patch {
+  width: 22px !important;
 }
 
-/deep/ .el-table__fixed-right{
+/deep/ .el-table__fixed-right {
   bottom: 0 !important;
+  left: auto;
+  right: 22px;
 }
 </style>

src/xt_pages/supply/components/editGoodOrder.vue

@@ -17,7 +17,7 @@
           <!-- <div>供应商:</div> -->
           <el-select
             v-model="supplier_name"
-            style="width: 140px; margin-right: 10px"
+            style="width: 220px; margin-right: 10px"
             placeholder="请选择"
             :disabled="disabled"
           >
@@ -565,11 +565,13 @@ export default {
       tableDataList: [],
     };
   },
-
-  watch() {
-    // total_price:function(newval,oldval){
-    //   console.log(newval,'op')
-    // }
+   watch: {
+    total_price: function (newval, oldval) {
+      if(this.rate_of_concession != ""){
+        this.addressChange()
+        this.count_payment()
+      }
+    }
   },
 
   methods: {
@@ -898,12 +900,14 @@ export default {
         ).toFixed(2);
       }
       this.discount_amount = discount_amount;
+      if(this.payment > 0) this.count_payment()
     },
     count_discount() {
       this.rate_of_concession = (
         this.discount_amount /
         (this.total_price * 0.01)
       ).toFixed(2);
+      if(this.payment > 0) this.count_payment()
     },
     count_payment() {
       let arrearage_1 = (
@@ -1581,9 +1585,25 @@ export default {
   margin-top: 15px;
   margin-bottom: 15px;
 }
+/deep/ .el-table--scrollable-x .el-table__body-wrapper {
+  overflow: auto;
+}
+/deep/ .gutter {
+  width: 15px !important;
+  display: inline-block !important;
+}
+/deep/ .el-table__fixed-right-patch {
+  width: 15px !important;
+}
+
+/deep/ .el-table__fixed-right {
+  bottom: 0 !important;
+  left: auto;
+  right: 0;
+}
 /deep/ .el-table__body-wrapper::-webkit-scrollbar {
-  width: 10px;
-  height: 10px;
+  width: 15px !important;
+  height: 15px !important;
 }
 </style>
 
@@ -1610,11 +1630,11 @@ export default {
 .el-table::before {
   background-color: #d0d3da;
 }
-.el-table__fixed-right {
+/* .el-table__fixed-right {
   width: 150px;
   bottom: 20px;
   height: 100%;
-}
+} */
 .reviewImg {
   position: fixed;
   left: 50%;

src/xt_pages/supply/components/editGoodReturn.vue

@@ -16,7 +16,7 @@
           <span style="color: red">*</span><span>供应商:</span>
           <el-select
             v-model="supplier_name"
-            style="width: 140px; margin-right: 10px"
+            style="width: 220px; margin-right: 10px"
             placeholder="请选择"
             :disabled ="disabled"
           >
@@ -1341,9 +1341,25 @@ export default {
   margin-bottom: 15px;
 }
 
+/deep/ .el-table--scrollable-x .el-table__body-wrapper {
+  overflow: auto;
+}
+/deep/ .gutter {
+  width: 15px !important;
+  display: inline-block !important;
+}
+/deep/ .el-table__fixed-right-patch {
+  width: 15px !important;
+}
+
+/deep/ .el-table__fixed-right {
+  bottom: 0 !important;
+  left: auto;
+  right: 0;
+}
 /deep/ .el-table__body-wrapper::-webkit-scrollbar {
-  width: 10px;
-  height: 10px;
+  width: 15px !important;
+  height: 15px !important;
 }
 </style>
 
@@ -1370,11 +1386,11 @@ export default {
 .el-table::before {
   background-color: #d0d3da;
 }
-.el-table__fixed-right {
+/* .el-table__fixed-right {
   width: 150px;
   bottom: 20px;
   height: 100%;
-}
+} */
 .reviewImg {
   position: fixed;
   left: 50%;

src/xt_pages/supply/components/editPurchaseOrder.vue

@@ -12,11 +12,11 @@
           align-items: center;
         "
       >
-        <div style="display:flex;align-items: center;">
+        <div style="display: flex; align-items: center">
           <span style="color: red">*</span><span>供应商:</span>
           <el-select
             v-model="supplier_name"
-            style="width: 140px; margin-right: 10px"
+            style="width: 220px; margin-right: 10px"
             placeholder="请选择"
             @change="changeTypeName"
             :disabled="disabled"
@@ -60,7 +60,7 @@
           ></el-date-picker>
           <span>单据编码:{{ number }}</span>
         </div>
-        <div style="display: flex;">
+        <div style="display: flex">
           <el-button size="small" type="primary" @click="toAdd" v-show="showOne"
             >生成采购单</el-button
           >
@@ -348,6 +348,7 @@
             v-model="discount_amount"
             :disabled="disabled"
             placeholder="请输入优惠金额"
+            @input="count_discount"
           ></el-input
         ></span>
       </div>
@@ -367,12 +368,20 @@
     <el-button @click="dialogVisible = false">取 消</el-button>
   </span>
   </el-dialog> -->
-  <popup ref="Popup" :content="content" :content_1="content_1" :content_2="content_2" :number="number" :orderList ="orderList" :type="type"></popup>
+    <popup
+      ref="Popup"
+      :content="content"
+      :content_1="content_1"
+      :content_2="content_2"
+      :number="number"
+      :orderList="orderList"
+      :type="type"
+    ></popup>
   </div>
 </template>
 
 <script>
-import popup from "./Popup"
+import popup from "./Popup";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import { uParseTime } from "@/utils/tools";
 import {
@@ -384,20 +393,20 @@ import {
   getGoodOrderList,
   getReturnOrder,
   deletePurchaseOrder,
-  deletePurchOder
+  deletePurchOder,
 } from "@/api/supply";
 export default {
   name: "addPurchaseOrder",
   components: {
     BreadCrumb,
-    popup
+    popup,
   },
   data() {
     return {
-      content_2:"采购单",
-      content:"采购订单",
-      content_1:"已有以下关联数据,不能反审核",
-      type:1,
+      content_2: "采购单",
+      content: "采购订单",
+      content_1: "已有以下关联数据,不能反审核",
+      type: 1,
       Reviewed: false,
       crumbs: [
         { path: false, name: "采购订单" },
@@ -454,9 +463,16 @@ export default {
       showThree: false,
       orderList: [],
       return_remark: "",
-      
     };
   },
+
+  watch: {
+    total_price: function (newval, oldval) {
+      if (this.rate_of_concession != "") {
+        this.addressChange();
+      }
+    },
+  },
   methods: {
     getInitOrder() {
       getInitOrder().then((response) => {
@@ -559,15 +575,23 @@ export default {
                 goodList[i].good_type_id = this.goodTypeList[y].type_name;
               }
             }
-            goodList[i].supply_name =goodList[i].good_name +" " +goodList[i].specification_name +" " + goodList[i].manufacturer;
+            goodList[i].supply_name =
+              goodList[i].good_name +
+              " " +
+              goodList[i].specification_name +
+              " " +
+              goodList[i].manufacturer;
             goodList[i].supply_type = goodList[i].good_type_id;
-            goodList[i].supply_specification_name =goodList[i].specification_name;
+            goodList[i].supply_specification_name =
+              goodList[i].specification_name;
             goodList[i].supply_price = goodList[i].buy_price;
-            goodList[i].supply_total = this.getTotalStockCount(goodList[i].good_warehouse_info);
+            goodList[i].supply_total = this.getTotalStockCount(
+              goodList[i].good_warehouse_info
+            );
             goodList[i].supply_count = "";
             goodList[i].supply_total_price = "";
             goodList[i].supply_manufacturer = goodList[i].manufacturer;
-            goodList[i].supply_license_number = goodList[i].number
+            goodList[i].supply_license_number = goodList[i].number;
             goodList[i].supply_remake = "";
             goodList[i].type = 2;
             goodList[i].name = goodList[i].good_name;
@@ -579,7 +603,6 @@ export default {
             this.tabList.push(goodList[i]);
           }
           this.goodList = goodList;
-          
         }
       });
     },
@@ -594,7 +617,8 @@ export default {
           this.recordInfo.tableList[i].name = val.name;
           this.recordInfo.tableList[i].supply_name = val.supply_name;
           this.recordInfo.tableList[i].supply_type = val.supply_type;
-          this.recordInfo.tableList[i].supply_specification_name =val.supply_specification_name;
+          this.recordInfo.tableList[i].supply_specification_name =
+            val.supply_specification_name;
           this.recordInfo.tableList[i].supply_total = val.supply_total;
           if (val.supply_count == NaN) {
             this.recordInfo.tableList[i].supply_count = "";
@@ -604,10 +628,15 @@ export default {
               : "";
           }
 
-          this.recordInfo.tableList[i].supply_price = val.supply_price? val.supply_price: "";
-          this.recordInfo.tableList[i].supply_total_price =val.supply_total_price ? val.supply_total_price : "";
-          this.recordInfo.tableList[i].supply_manufacturer =val.supply_manufacturer;
-          this.recordInfo.tableList[i].supply_license_number =val.supply_license_number;
+          this.recordInfo.tableList[i].supply_price = val.supply_price
+            ? val.supply_price
+            : "";
+          this.recordInfo.tableList[i].supply_total_price =
+            val.supply_total_price ? val.supply_total_price : "";
+          this.recordInfo.tableList[i].supply_manufacturer =
+            val.supply_manufacturer;
+          this.recordInfo.tableList[i].supply_license_number =
+            val.supply_license_number;
           this.recordInfo.tableList[i].supply_remake = val.supply_remake;
           this.recordInfo.tableList[i].is_total = val.is_total;
           this.recordInfo.tableList[i].supply_unit = val.supply_unit;
@@ -641,42 +670,40 @@ export default {
       this.recordInfo.tableList.push(tempObj);
     },
     handleDelete: function (index, row) {
-      
-      if(this.is_check == 1){
-         this.$message.error("已审核单据，不能删除!")
-         return false
+      if (this.is_check == 1) {
+        this.$message.error("已审核单据，不能删除!");
+        return false;
       }
-      if(row.id == 0){
+      if (row.id == 0) {
         if (this.recordInfo.tableList.length <= 1) {
           this.$message.error("只有一条记录的时候无法删除");
           return;
         } else {
           this.recordInfo.tableList.splice(index, 1);
         }
-      }else{
-          const params = {
-            id: row.id
-          }
-          this.$confirm('确认删除吗?', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            deletePurchOder(params).then(response => {
+      } else {
+        const params = {
+          id: row.id,
+        };
+        this.$confirm("确认删除吗?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            deletePurchOder(params).then((response) => {
               if (response.data.state == 0) {
-                this.$message.error(response.data.msg)
-                return false
+                this.$message.error(response.data.msg);
+                return false;
               } else {
-                this.$message.success('删除成功')
+                this.$message.success("删除成功");
 
-                this.recordInfo.tableList.splice(index, 1)
+                this.recordInfo.tableList.splice(index, 1);
               }
-            })
-          }).catch(() => {
-        })
-        
+            });
+          })
+          .catch(() => {});
       }
-      
     },
 
     changeTypeName() {},
@@ -715,12 +742,11 @@ export default {
       for (let i = 0; i < arr.length; i++) {
         total_count += arr[i].stock_count;
       }
-      if(total_count >0){
+      if (total_count > 0) {
         return total_count;
-      }else{
-        return ""
+      } else {
+        return "";
       }
-     
     },
     calculate: function (val) {
       if (isNaN(val)) {
@@ -746,13 +772,21 @@ export default {
       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_license_number =this.recordInfo.tableList[i].supply_license_number.toString();
-            this.recordInfo.tableList[i].supply_total_price = (this.recordInfo.tableList[i].supply_count *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_price = this.recordInfo.tableList[i].supply_price.toString();
+            this.recordInfo.tableList[i].supply_count = parseInt(
+              this.recordInfo.tableList[i].supply_count
+            );
+            this.recordInfo.tableList[i].supply_license_number =
+              this.recordInfo.tableList[i].supply_license_number.toString();
+            this.recordInfo.tableList[i].supply_total_price = (
+              this.recordInfo.tableList[i].supply_count *
+              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_price =
+              this.recordInfo.tableList[i].supply_price.toString();
             for (let j = 0; j < this.manufactuerList.length; j++) {
               if (
                 this.recordInfo.tableList[i].supply_manufacturer ==
@@ -776,8 +810,8 @@ export default {
             stockIn: this.recordInfo.tableList,
             return_remake: this.return_remark,
           };
-          console.log("哈哈哈哈哈哈",params)
-          
+          console.log("哈哈哈哈哈哈", params);
+
           updatePurchaseOrder(
             params,
             this.supplier_name,
@@ -792,7 +826,7 @@ export default {
               this.loading = false;
               var warehousingInfo = response.data.data.warehousingInfo;
               this.$message.success("保存成功!");
-              this.getPurchaseOrderDetail()
+              this.getPurchaseOrderDetail();
             }
           });
         }
@@ -807,7 +841,7 @@ export default {
           this.recordInfo.tableList[i].supply_count;
       }
       this.total_price = total_price;
-      this.addressChange()
+      // this.discount_amount = (this.total_price * this.rate_of_concession * 0.01).toFixed(2);
       return total_price.toFixed(2);
     },
 
@@ -816,7 +850,8 @@ export default {
         confirmButtonText: "确 定",
         cancelButtonText: "取 消",
         type: "warning",
-      }).then(() => {
+      })
+        .then(() => {
           checkPurchaseOrder(this.id).then((response) => {
             if (response.data.state == 1) {
               var info = response.data.data.info;
@@ -872,11 +907,11 @@ export default {
             this.showTwo = false;
             this.showThree = true;
           }
-         
+
           var drugList = response.data.data.baseList;
           var goodList = response.data.data.goodList;
           for (let i = 0; i < orderInfo.length; i++) {
-            orderInfo[i].id = orderInfo[i].id
+            orderInfo[i].id = orderInfo[i].id;
             orderInfo[i].supply_count = orderInfo[i].count;
             orderInfo[i].supply_price = orderInfo[i].price;
             orderInfo[i].supply_remake = orderInfo[i].remark;
@@ -910,32 +945,31 @@ export default {
               }
             }
           }
-         
+
           this.recordInfo.tableList = [];
-          if(orderInfo.length == 0){
-              const tempObj = {};
-              tempObj["id"] = 0;
-              tempObj["name"] = "";
-              tempObj["supply_name"] = "";
-              tempObj["supply_type"] = "";
-              tempObj["supply_specification_name"] = "";
-              tempObj["supply_total"] = "";
-              tempObj["supply_count"] = "";
-              tempObj["supply_price"] = "";
-              tempObj["supply_total_price"] = "";
-              tempObj["supply_manufacturer"] = "";
-              tempObj["supply_license_number"] = "";
-              tempObj["supply_remake"] = "";
-              tempObj["type"] = 0;
-              tempObj["is_total"] = 1;
-              tempObj["project_id"] = 0;
-              tempObj["supply_unit"] = "";
-              tempObj["manufacturer_id"] = "";
-              this.recordInfo.tableList.push(tempObj);
-          }else{
+          if (orderInfo.length == 0) {
+            const tempObj = {};
+            tempObj["id"] = 0;
+            tempObj["name"] = "";
+            tempObj["supply_name"] = "";
+            tempObj["supply_type"] = "";
+            tempObj["supply_specification_name"] = "";
+            tempObj["supply_total"] = "";
+            tempObj["supply_count"] = "";
+            tempObj["supply_price"] = "";
+            tempObj["supply_total_price"] = "";
+            tempObj["supply_manufacturer"] = "";
+            tempObj["supply_license_number"] = "";
+            tempObj["supply_remake"] = "";
+            tempObj["type"] = 0;
+            tempObj["is_total"] = 1;
+            tempObj["project_id"] = 0;
+            tempObj["supply_unit"] = "";
+            tempObj["manufacturer_id"] = "";
+            this.recordInfo.tableList.push(tempObj);
+          } else {
             this.recordInfo.tableList = orderInfo;
           }
-         
         }
       });
     },
@@ -955,21 +989,23 @@ export default {
           var purcaseOrder = response.data.data.purcaseOrder;
 
           var goodOrder = response.data.data.goodOrder;
-         
+
           var drugList = response.data.data.drugList;
-      
+
           var ids = "";
           // 如果采购单没有数据，则代表改订单第一次生成采购订单数据
           if (goodOrder.length == 0) {
-            this.$router.push({path: "/good/order/add?id=" + id + "&ids=" + ids});
+            this.$router.push({
+              path: "/good/order/add?id=" + id + "&ids=" + ids,
+            });
           }
-       
-          
+
           for (let i = 0; i < purcaseOrder.length; i++) {
             for (let j = 0; j < drugList.length; j++) {
               if (purcaseOrder[i].is_source == 1) {
                 if (purcaseOrder[i].supply_unit == drugList[j].max_unit) {
-                  purcaseOrder[i].count = purcaseOrder[i].count * drugList[j].min_number;
+                  purcaseOrder[i].count =
+                    purcaseOrder[i].count * drugList[j].min_number;
                 }
               }
             }
@@ -979,7 +1015,8 @@ export default {
             for (let j = 0; j < drugList.length; j++) {
               if (goodOrder[i].is_source == 1) {
                 if (goodOrder[i].supply_unit == drugList[j].max_unit) {
-                    goodOrder[i].count = goodOrder[i].count * drugList[j].min_number;
+                  goodOrder[i].count =
+                    goodOrder[i].count * drugList[j].min_number;
                 }
               }
             }
@@ -1006,7 +1043,6 @@ export default {
                 }
               }
             }
-     
 
             for (let i = 0; i < newArr.length; i++) {
               for (let j = 0; j < newArr[i].child.length; j++) {
@@ -1014,95 +1050,104 @@ export default {
               }
             }
 
-            var arr = []; 
+            var arr = [];
             var total = 0;
             var str = "";
-            console.log("newArr2323223323223",newArr)
-            console.log("newArr2323223323223",purcaseOrder)
-            
+            console.log("newArr2323223323223", newArr);
+            console.log("newArr2323223323223", purcaseOrder);
 
-           console.log("长度1",goodOrder.length)
-           console.log("长度2",purcaseOrder.length)
+            console.log("长度1", goodOrder.length);
+            console.log("长度2", purcaseOrder.length);
 
-          if(purcaseOrder.length <=goodOrder.length){
-            //如果采购单有数据，则需要比较数量
-            if (newArr.length > 0) {
-              for (let i = 0; i < purcaseOrder.length; i++) {
-                for (let j = 0; j < newArr.length; j++) {
-                  if (purcaseOrder[i].project_id == newArr[j].project_id) {
-                    //根据商品ID比较数量大小,把数量不足的商品ID储存,表示采购单的数量未满足采购订单的数据，可以继续生成采购单
-                    if (purcaseOrder[i].count > newArr[j].count) {
-                      arr.push(purcaseOrder[i].project_id);
+            if (purcaseOrder.length <= goodOrder.length) {
+              //如果采购单有数据，则需要比较数量
+              if (newArr.length > 0) {
+                for (let i = 0; i < purcaseOrder.length; i++) {
+                  for (let j = 0; j < newArr.length; j++) {
+                    if (purcaseOrder[i].project_id == newArr[j].project_id) {
+                      //根据商品ID比较数量大小,把数量不足的商品ID储存,表示采购单的数量未满足采购订单的数据，可以继续生成采购单
+                      if (purcaseOrder[i].count > newArr[j].count) {
+                        arr.push(purcaseOrder[i].project_id);
+                      }
                     }
                   }
                 }
-              }
-              //如果total的长度等于 采购单的长度,怎表示该采购订单已经全部生成
-             
-              if (arr.length == 0) {
-                this.$message.error("该订单已全部生成采购单，请知悉!");
-                return;
-              }
+                //如果total的长度等于 采购单的长度,怎表示该采购订单已经全部生成
 
-              if (arr.length >0) {
-                str = arr.join(",");
-                this.$router.push({path: "/good/order/add?id=" + id + "&ids=" + str});
-              }
+                if (arr.length == 0) {
+                  this.$message.error("该订单已全部生成采购单，请知悉!");
+                  return;
+                }
 
+                if (arr.length > 0) {
+                  str = arr.join(",");
+                  this.$router.push({
+                    path: "/good/order/add?id=" + id + "&ids=" + str,
+                  });
+                }
+              }
             }
-
-          }
-          //如果采购订单的商品个数不等与 采购单里面的商品个数
-          if(purcaseOrder.length>goodOrder.length){
-           var arrList = []
-           var str = "";
-            if (newArr.length > 0) {
-              for (let i = 0; i < purcaseOrder.length; i++) {
-                for (let j = 0; j < newArr.length; j++) {
-                  //如果采购订单的商品个数不等与 采购单里面的商品个数
-                  if(purcaseOrder[i].project_id != newArr[j].project_id){
-                     arrList.push(purcaseOrder[i].project_id)
+            //如果采购订单的商品个数不等与 采购单里面的商品个数
+            if (purcaseOrder.length > goodOrder.length) {
+              var arrList = [];
+              var str = "";
+              if (newArr.length > 0) {
+                for (let i = 0; i < purcaseOrder.length; i++) {
+                  for (let j = 0; j < newArr.length; j++) {
+                    //如果采购订单的商品个数不等与 采购单里面的商品个数
+                    if (purcaseOrder[i].project_id != newArr[j].project_id) {
+                      arrList.push(purcaseOrder[i].project_id);
+                    }
                   }
                 }
-              }
-              //如果total的长度等于 采购单的长度,怎表示该采购订单已经全部生成
-              console.log("are232323323223322323",arrList)
-              if(arrList.length > 0){
-                str = arrList.join(",");
-                this.$router.push({path: "/good/order/add?id=" + id + "&ids=" + str});
+                //如果total的长度等于 采购单的长度,怎表示该采购订单已经全部生成
+                console.log("are232323323223322323", arrList);
+                if (arrList.length > 0) {
+                  str = arrList.join(",");
+                  this.$router.push({
+                    path: "/good/order/add?id=" + id + "&ids=" + str,
+                  });
+                }
               }
             }
-           }
           }
         }
       });
     },
     addressChange() {
+      var discount_amount = 0;
       if (this.rate_of_concession > 0) {
-        this.discount_amount = (
+        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);
     },
     checkReturnOrder() {
       var id = this.$route.query.id;
       //获取购货订单号
       getGoodOrderList(id).then((response) => {
         if (response.data.state == 1) {
-          var list = response.data.data.list
-        
-          this.orderList = list
+          var list = response.data.data.list;
+
+          this.orderList = list;
           //如果长度大于0,有购货单不能反审核
           if (list.length > 0) {
-            this.$refs.Popup.dialogVisible = true
-            return 
+            this.$refs.Popup.dialogVisible = true;
+            return;
           }
           if (list.length == 0) {
-            this.getReturnOrder()
-            this.showOne = false
-            this.showTwo = true
-            this.showThree = false
+            this.getReturnOrder();
+            this.showOne = false;
+            this.showTwo = true;
+            this.showThree = false;
           }
         }
       });
@@ -1113,14 +1158,14 @@ export default {
         if (response.data.state == 1) {
           var msg = response.data.data.msg;
           this.disabled = false;
-          this.Reviewed = false
+          this.Reviewed = false;
           this.$message.success("反审核成功!");
           this.getPurchaseOrderDetail();
         }
       });
     },
     toClick(id) {
-      this.$router.push({path:"/good/order/edit?id=" + id});
+      this.$router.push({ path: "/good/order/edit?id=" + id });
     },
   },
   created() {
@@ -1174,9 +1219,25 @@ export default {
   margin-top: 15px;
   margin-bottom: 15px;
 }
+/deep/ .el-table--scrollable-x .el-table__body-wrapper {
+  overflow: auto;
+}
+/deep/ .gutter {
+  width: 15px !important;
+  display: inline-block !important;
+}
+/deep/ .el-table__fixed-right-patch {
+  width: 15px !important;
+}
+
+/deep/ .el-table__fixed-right {
+  bottom: 0 !important;
+  left: auto;
+  right: 0;
+}
 /deep/ .el-table__body-wrapper::-webkit-scrollbar {
-  width: 10px;
-  height: 10px;
+  width: 15px !important;
+  height: 15px !important;
 }
 </style>
 
@@ -1203,17 +1264,15 @@ export default {
 .el-table::before {
   background-color: #d0d3da;
 }
-.el-table__fixed-right {
+/* .el-table__fixed-right {
   width: 150px;
   bottom: 20px;
   height: 100%;
-}
+} */
 .reviewImg {
   position: fixed;
   left: 50%;
   transform: translateX(-50%);
   top: 30%;
 }
-
-
 </style>

src/xt_pages/supply/components/editSupply.vue

@@ -916,9 +916,9 @@ border-color: #d0d3da;
 .el-table::before {
 background-color: #d0d3da;
 }
-.el-table__fixed-right{
+/* .el-table__fixed-right{
   width:150px;
-  /* bottom: 20px; */
+  bottom: 20px;
   height: 100%;
-}
+} */
 </style>

src/xt_pages/supply/goodreturn.vue

@@ -87,7 +87,7 @@
         border
         style="width: 100%"
       >
-        <el-table-column label="单据日期" align="center" width="200">
+        <el-table-column label="单据日期" align="center" width="100">
           <template slot-scope="scope">
             <span>{{ getTimes(scope.row.document_date) }}</span>
           </template>
@@ -124,14 +124,14 @@
             >
           </template>
         </el-table-column>
-        <el-table-column label="采购金额" align="center" width="200">
+        <el-table-column label="采购金额" align="center" width="130">
           <template slot-scope="scope">
             <span v-if="getAllBuyPrice(scope.row.cancelOrder) > 0">{{
               getAllBuyPrice(scope.row.cancelOrder)
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="优惠后金额" align="center" width="200">
+        <el-table-column label="优惠后金额" align="center" width="130">
           <template slot-scope="scope">
             <span v-if="getAllBuyPrice(scope.row.cancelOrder) > 0">{{
               getAllBuyPriceOne(
@@ -141,34 +141,35 @@
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="已退款" align="center" width="200">
+        <el-table-column label="已退款" align="center" width="130">
           <template slot-scope="scope">
             <span v-if="scope.row.payment > 0">{{ scope.row.payment }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="数量" align="center" width="200">
+        <el-table-column label="数量" align="center" width="120">
           <template slot-scope="scope">
             {{ getCount(scope.row.cancelOrder) }}
           </template>
         </el-table-column>
 
-        <el-table-column label="退款状态" align="center" width="200">
+        <el-table-column label="退款状态" align="center" width="120">
           <template slot-scope="scope">
             <!-- <span v-if="scope.row.is_check == 2">未审核</span>
            <span v-if="scope.row.is_check == 1">已审核</span> -->
+          
            <span v-if="scope.row.payment == 0">未退款</span>
            <span v-if="scope.row.payment > 0 && scope.row.payment< getAllBuyPriceOne(scope.row.cancelOrder,scope.row.discount_amount)">部分退款</span>
            <span v-if="scope.row.payment > 0 && scope.row.payment == getAllBuyPriceOne(scope.row.cancelOrder,scope.row.discount_amount)">全部退款</span>
           </template>
         </el-table-column>
 
-        <el-table-column label="制单人" align="center" width="200">
+        <el-table-column label="制单人" align="center" width="120">
           <template slot-scope="scope">
             {{ getDocName(scope.row.creater) }}
           </template>
         </el-table-column>
 
-        <el-table-column label="审核人" align="center" width="200">
+        <el-table-column label="审核人" align="center" width="120">
           <template slot-scope="scope">
             {{ getDocName(scope.row.checker) }}
           </template>

src/xt_pages/supply/supplyQuery.vue

@@ -15,7 +15,7 @@
         <div>
           <el-select
             v-model="type_name"
-            style="width: 170px; margin-right: 10px"
+            style="width: 220px; margin-right: 10px"
             clearable
             placeholder="请选择供应商类别"
             @change="changeTypeName"