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/addGoodOrder.vue

@@ -872,7 +872,7 @@ export default {
     },
 
     count_arrearage() {
-      this.payment = this.total_price - this.arrearage;
+      this.payment = (this.total_price - this.arrearage).toFixed(2);
     },
     // checkPurchaseOrder() {
     //   this.$confirm("是否审核?", {

src/xt_pages/supply/components/addGoodReturn.vue

@@ -454,6 +454,7 @@ export default {
       rate_of_concession: "",
       arrearage: "",
       payment: "",
+      total_price: 0,
       discount_amount: "",
       tableRules: {
         name: [{ required: true, message: "商品不能为空", trigger: "blur" }],
@@ -481,7 +482,9 @@ export default {
   watch: {
     total_price: function (newval, oldval) {
       if(this.rate_of_concession != ""){
+        console.log('00')
         this.addressChange()
+        this.count_payment()
       }
     }
   },
@@ -790,21 +793,18 @@ export default {
       }
       return uParseTime(time, "{y}-{m}-{d}");
     },
-
-     getAllPrice() {
+  getAllPrice() {
       var total_price = 0;
       for (let i = 0; i < this.recordInfo.tableList.length; i++) {
-        total_price +=(this.recordInfo.tableList[i].supply_price *this.recordInfo.tableList[i].supply_count - (this.recordInfo.tableList[i].supply_price * this.recordInfo.tableList[i].supply_count*this.recordInfo.tableList[i].deposit_rate/100))
+        total_price +=
+          this.recordInfo.tableList[i].supply_price *
+          this.recordInfo.tableList[i].supply_count;
       }
       this.total_price = total_price;
-      if(total_price > 0){
-         return total_price.toFixed(2);
-      }else{
-        return ""
-      }
-
+      // this.discount_amount = (this.total_price * this.rate_of_concession * 0.01).toFixed(2);
+      return total_price.toFixed(2);
     },
-    addressChange() {
+     addressChange() {
       var discount_amount = 0;
       if (this.rate_of_concession > 0) {
         discount_amount = (
@@ -813,19 +813,26 @@ 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);
+        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);
-       if(arrearage_1 > 0){
-          this.arrearage = arrearage_1
-       }else{
-         this.arrearage = 0
-       }
+    count_payment() {
+      let arrearage_1 = (
+        this.total_price -
+        this.discount_amount -
+        this.payment
+      ).toFixed(2);
+      if (arrearage_1 > 0) {
+        this.arrearage = arrearage_1;
+      } else {
+        this.arrearage = 0;
+      }
     },
 
     count_arrearage() {

src/xt_pages/supply/components/addPurchaseOrder.vue

@@ -55,7 +55,7 @@
           ></el-date-picker>
           <span>单据编码:{{ number }}</span>
         </div>
-        <div>
+        <div style="display:flex;">
           <el-button
             size="small"
             type="primary"
@@ -449,6 +449,15 @@ export default {
       is_check: 2,
     };
   },
+
+ watch: {
+    total_price: function (newval, oldval) {
+      if (this.rate_of_concession != "") {
+        this.addressChange();
+      }
+    },
+  },
+
   methods: {
     getInitOrder() {
       getInitOrder().then((response) => {
@@ -874,6 +883,8 @@ export default {
         }
       });
     },
+
+
     getAllPrice() {
       var total_price = 0;
       for (let i = 0; i < this.recordInfo.tableList.length; i++) {
@@ -882,9 +893,11 @@ export default {
           this.recordInfo.tableList[i].supply_count;
       }
       this.total_price = total_price;
-      this.discount_amount = (this.total_price * this.rate_of_concession * 0.01).toFixed(2);
+      // this.discount_amount = (this.total_price * this.rate_of_concession * 0.01).toFixed(2);
       return total_price.toFixed(2);
     },
+
+    
     count_discount() {
       this.rate_of_concession = (
         this.discount_amount /
@@ -1127,8 +1140,8 @@ export default {
 }
 
 /deep/ .el-table__body-wrapper::-webkit-scrollbar {
-  width: 10px;
-  height: 10px;
+  width: 15px !important;
+  height: 15px !important;
 }
 </style>
 

src/xt_pages/supply/components/editGoodOrder.vue

@@ -563,6 +563,7 @@ export default {
       warese_out_id: 0,
       return_remark: "",
       tableDataList: [],
+      total_price: 0,
     };
   },
    watch: {
@@ -880,7 +881,7 @@ export default {
       return uParseTime(time, "{y}-{m}-{d}");
     },
 
-    getAllPrice() {
+ getAllPrice() {
       var total_price = 0;
       for (let i = 0; i < this.recordInfo.tableList.length; i++) {
         total_price +=
@@ -888,7 +889,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);
     },
     addressChange() {

src/xt_pages/supply/components/editGoodReturn.vue

@@ -500,8 +500,21 @@ export default {
       dialogVisible: false,
       return_remark: "",
       warehouse_out_id: 0,
+       total_price: 0,
     };
   },
+
+  watch: {
+    total_price: function (newval, oldval) {
+      if(this.rate_of_concession != ""){
+        console.log('00')
+        this.addressChange()
+        this.count_payment()
+      }
+    }
+  },
+
+
   methods: {
     getInitOrder() {
       getInitOrder().then((response) => {
@@ -937,21 +950,19 @@ export default {
         }
       });
     },
-    getAllPrice() {
+  getAllPrice() {
       var total_price = 0;
       for (let i = 0; i < this.recordInfo.tableList.length; i++) {
-        total_price +=(this.recordInfo.tableList[i].supply_price *this.recordInfo.tableList[i].supply_count - (this.recordInfo.tableList[i].supply_price * this.recordInfo.tableList[i].supply_count*this.recordInfo.tableList[i].deposit_rate/100))
+        total_price +=
+          this.recordInfo.tableList[i].supply_price *
+          this.recordInfo.tableList[i].supply_count;
       }
       this.total_price = total_price;
-      if(total_price > 0){
-         return total_price.toFixed(2);
-      }else{
-        return ""
-      }
-     
+      // this.discount_amount = (this.total_price * this.rate_of_concession * 0.01).toFixed(2);
+      return total_price.toFixed(2);
     },
 
-    addressChange() {
+     addressChange() {
       var discount_amount = 0;
       if (this.rate_of_concession > 0) {
         discount_amount = (
@@ -960,16 +971,25 @@ 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);
+      let arrearage_1 = (
+        this.total_price -
+        this.discount_amount -
+        this.payment
+      ).toFixed(2);
       if (arrearage_1 > 0) {
         this.arrearage = arrearage_1;
       } else {

src/xt_pages/supply/components/goodOrderPrint.vue

@@ -76,7 +76,7 @@
                   <td style="line-height: 18px">{{getAllPriceOne()}}</td>
                 </tr>
                  <tr>
-                  <td colspan="9" style="line-height: 18px">合计  金额大写 {{getAllPrice()}}</td>
+                  <td colspan="9" style="line-height: 18px;text-align: left;">合计  金额大写 {{getAllPrice()}}</td>
                 </tr>
               </tbody>
             </table>

src/xt_pages/supply/components/goodReturnPrint.vue

@@ -87,7 +87,7 @@
                   <td style="line-height: 18px">{{getAllPriceTwo()}}</td>
                 </tr>
                  <tr>
-                  <td colspan="9" style="line-height: 18px">合计  金额大写 {{getAllPrice()}}</td>
+                  <td colspan="9" style="line-height: 18px;text-align: left;">合计  金额大写 {{getAllPrice()}}</td>
                 </tr>
               </tbody>
             </table>

src/xt_pages/supply/components/purchaseOrderPrint.vue

@@ -74,7 +74,7 @@
                   <td colspan="2" style="line-height: 18px">{{getTotalPrice()}}</td>
                 </tr>
                  <tr>
-                  <td colspan="6" style="line-height: 18px">合计  金额大写 {{getAllPrice()}}</td>
+                  <td colspan="6" style="line-height: 18px;text-align: left;">合计  金额大写 {{getAllPrice()}}</td>
                  </tr>
               </tbody>
             </table>

src/xt_pages/supply/goodreturn.vue

@@ -492,14 +492,10 @@ export default {
 }
 
 .el-table__fixed-right {
-  width: 150px;
-  bottom: 20px;
   height: 100% !important;
 }
-.el-table__fixed-body-wrapper {
+/* .el-table__fixed-body-wrapper {
   height: 100%;
-}
-.el-table__body-wrapper.is-scrolling-left {
-  max-height: 100% !important;
-}
+} */
+
 </style>

src/xt_pages/supply/purchaseOrderQuery.vue

@@ -103,11 +103,9 @@
         </el-table-column>
         <el-table-column label="关联采购单号" align="center" width="150">
           <template slot-scope="scope">
-            <div style="width: 100%; height: 100%">
-              <tr class="color" v-for="(item,index) in scope.row.orderOut" :key="index">
-                 <td style="border-right:none;">{{item.good_number}}</td>
+            <tr v-for="(item,index) in scope.row.orderOut" :key="index">
+                 <td>{{item.good_number}}</td>
               </tr>
-            </div>
           </template>
         </el-table-column>
         <el-table-column label="采购金额" align="center">
@@ -212,7 +210,6 @@ export default {
   data() {
     return {
       isActive: false,
-      aa: ["111111", "22222"],
       Color_txt: true,
       crumbs: [
         { path: false, name: "采购管理" },