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

src/api/supply.js

@@ -266,13 +266,21 @@ export function savesupply(data) {
   })
 }
 
-export function updatesupply(data) {
+export function updatesupply(data,params) {
   return request({
-    url: '/api/supply/updatesupply',
+    url: '/api/supply/updatesupply?suppliercode=' + params.supplierCode + '&suppliername=' + params.supplierName,
     method: 'post',
     data: data
   })
 }
 
+// export function updatesupply(data) {
+//   return request({
+//     url: '/api/supply/updatesupply' ,
+//     method: 'post',
+//     data: data
+//   })
+// }
+
 
 

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -183,6 +183,7 @@
     },
     methods: {
       show: function (total,order) {
+
         this.form.total = total
         this.form.private_price = total
         this.form.pay_price = total

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -560,7 +560,7 @@
         this.form.age = jsGetAge(births, '-')
 
 
-
+        this.InsuplcAdmdvs = []
         var that = this
         let params={
           id_card_no: this.form.id_card,
@@ -590,7 +590,7 @@
                   }).catch(() => {
                   })
                 } else {
-                  that.InsuplcAdmdvs = []
+
                   for(let i =0; i < response.data.data.info.output.insuinfo.length; i++){
                     that.InsuplcAdmdvs.push({
                       value:response.data.data.info.output.insuinfo[i].insuplc_admdvs,

src/xt_pages/outpatientCharges/statementTemplate/printThree.vue

@@ -3,7 +3,7 @@
         <div v-if="paramsObj.balance_accounts_type != 2" id='prescription-print' class="prescription-print"
              style="position: relative;">
             <img style="width:100%;height:80px" v-if="org_id != 10278" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
-            <img style="width:100%;height:80px" v-else src="https://kuyi.shengws.com/beierlog.png" alt="">
+            <img style="width:100%;height:80px" v-if="org_id == 10278" src="https://kuyi.shengws.com/beierlog.png" alt="">
             <div class="printTitle" style="position: absolute;left: 40%;top: 50px;">门诊收费清单</div>
             <div style="display:flex;">
                 <div>单据号：<span
@@ -284,7 +284,7 @@
                 </div>
             </div>
             <img style="width:100%;" v-if="org_id != 10278" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
-            <img style="width:100%;" v-else src="https://kuyi.shengws.com/bailinbeier.png" alt="">
+            <img style="width:100%;" v-if="org_id == 10278" src="https://kuyi.shengws.com/bailinbeier.png" alt="">
         </div>
     </div>
 

src/xt_pages/supply/components/addGoodReturn.vue

@@ -290,6 +290,7 @@
         >
         </el-input>
       </div>
+      <div style="margin-top: 10px">合计:{{ getAllPrice() }} 元</div>
       <div style="margin-top: 10px">
         <span
           >优惠率:<el-input
@@ -701,6 +702,7 @@ export default {
           this.recordInfo.tableList[i].supply_price *
           this.recordInfo.tableList[i].supply_count;
       }
+      this.total_price = total_price;
       return total_price.toFixed(2);
     },
     checkPurchaseOrder(id, index) {

src/xt_pages/supply/components/addSupply.vue

@@ -384,10 +384,11 @@ export default {
               if (valid) {
                 let params = {
                   ...this.supplier,
-                  ...this.recordInfo,
+                  // ...this.recordInfo
                 };
+                let data = { ...this.recordInfo };
                 console.log(params, "dhas");
-                updatesupply(params).then((res) => {
+                updatesupply(data,params).then((res) => {
                   console.log(res, "oo");
                 });
               } else {
@@ -401,7 +402,6 @@ export default {
           }
         });
       }
-
       this.contactsinfo();
     },