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

src/store/modules/globalConfig.js

     }
     ],
 
-    good_unit: [{
+    good_unit: [
+      {
       id: 1,
       name: '支'
     },

src/xt_pages/data/components/drugs.vue

 
           val.min_number =  parseInt(val.min_number)
           console.log("Val323323232",val)
-          
+
           editBaseDrugLib(val,untit).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
               if(this.formValue.drug_classify == 0){
                  this.formValue.drug_classify = ""
               }
-             
+
 
 
               this.$refs.addDrugs.show(id, this.formValue)
         };
         console.log("params222222222",params)
 
-        postDrugInformation(params).then(response=>{
-           if(response.data.state == 1){
-             var msg =  response.data.data.msg;
-             this.getList();
-             this.getAllManufacturer();
-             this.GetAllConfig();
-             this.$message.success("导入成功!")
 
-           }else{
-             this.$message.error("导入失败,请下载日志查看")
-           }
-        })
+        // postDrugInformation(params).then(response=>{
+        //    if(response.data.state == 1){
+        //      var msg =  response.data.data.msg;
+        //      this.getList();
+        //      this.getAllManufacturer();
+        //      this.GetAllConfig();
+        //      this.$message.success("导入成功!")
+        //
+        //    }else{
+        //      this.$message.error("导入失败,请下载日志查看")
+        //    }
+        // })
       },
       generateTxt: function(log) {
         var content = '';

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

                     <el-col :span="8">
                         <el-form-item
                                 label="置换液："
-                                v-if="isShows('置换液')"
+                                v-if="isShows('置换液')&&this.$store.getters.xt_user.org.id != 10206"
                                 v-show="huShow"
                                 prop="displace_liqui_part"
                                 :rules="isCheckmust('置换液')"
                                 ></el-option>
                             </el-select>
                         </el-form-item>
+                      <el-form-item
+                        label="置换液："
+                        v-if="isShows('置换方式')&&this.$store.getters.xt_user.org.id == 10206"
+                        v-show="huShow"
+                        prop="displace_liqui_part"
+                        :rules="isCheckmust('置换方式')"
+                      >
+                        <el-select
+                          v-model="dialysisPrescription.displace_liqui_part"
+                          placeholder="请选择"
+                        >
+                          <el-option :key="0" label="请选择" :value="0"></el-option>
+                          <el-option
+                            v-for="(option, index) in displace_liqui_part_option"
+                            :key="index + 'u'"
+                            :label="option.name"
+                            :value="option.id"
+                          ></el-option>
+                        </el-select>
+                      </el-form-item>
+
                     </el-col>
 
                     <el-col :span="8"
         if(moment().weekday() == 0){
            total_day ="周日"
         }
-       
+
         if(this.targetAdvices!=null && this.targetAdvices.length >0){
             for (let i = 0; i < this.targetAdvices.length; i++) {
               if(this.targetAdvices[i].week_day.indexOf(total_day)!=-1){
                   ParamsQuery['patient'] = this.patient.id
                   ParamsQuery['record_date'] = this.record_date
                   ParamsQuery['mode'] = '1'
-               
+
                   postSoulution(ParamsQuery).then(response => {
                     if (response.data.state == 0) {
                       this.$message.error(response.data.msg)

src/xt_pages/outpatientCharges/invoiceTemplate/printFive.vue

             <div :style="{position: 'absolute',top:(315 + (index * 400))  + 'px',left:460+ 'px'}">{{ list.medfee_sumamt }}</div>
             <div v-if="index == pageArr.length - 1" :style="{position: 'absolute',top:(330 + (index * 400))  + 'px',left:110+ 'px',width:100 + '%'}">
                 <div style="display:flex;">
-                  <div style="width:170px">医疗总费用：{{ list.order.medfee_sumamt }}</div>
+                  <div style="width:160px">医疗总费用：{{ list.order.medfee_sumamt }}</div>
                   <div style="width:170px">基金支付总额：{{ list.order.fund_pay_sumamt }}</div>
-                  <div style="width:170px">统筹支出：{{ list.order.hifp_pay }}</div>
-                  <div style="width:170px">大病支出：{{list.order.hifmi_pay}}</div>
+                  <div style="width:150px">统筹支出：{{ list.order.hifp_pay }}</div>
+                  <div style="width:160px">大病支出：{{list.order.hifmi_pay}}</div>
 
                 </div>
                 <div style="display:flex;">
                   <div style="width:170px">个人账户支付：{{ list.order.acct_pay }}</div>
-                  <div style="width:170px">现金支出：{{ list.order.psn_cash_pay }}</div>
-                  <div style="width:170px">本次账户：0</div>
-                  <div style="width:170px">上次账户：0</div>
+                  <div style="width:160px">现金支出：{{ list.order.psn_cash_pay }}</div>
+                  <div style="width:150px">本次账户：0</div>
+                  <div style="width:150px">上次账户：0</div>
                 </div>
               <div style="display:flex;">
                 <div style="width:170px">账户余额：{{ list.order.balc }}</div>
                 <div style="width:170px">其他支出：{{ list.order.oth_pay }}</div>
-                <div style="width:170px">民政支出：0</div>
+                <div style="width:150px">民政支出：0</div>
               </div>
               <div style="display:flex;">
                 <div style="width:220px">医疗救助基金支出：{{ list.order.maf_pay }}</div>
 
             </div>
             <div>
-                <div :style="{position: 'absolute',top:(390 + (index * 400))  + 'px',left:100+ 'px'}">{{ org_name }}</div>
-                <div :style="{position: 'absolute',top:(390 + (index * 400))  + 'px',left:360+ 'px'}">{{ paramsObj.chargeName }}</div>
-                <div :style="{position: 'absolute',top:(390 + (index * 400))  + 'px',left:520+ 'px'}">
+                <div :style="{position: 'absolute',top:(405 + (index * 400))  + 'px',left:100+ 'px'}">{{ org_name }}</div>
+                <div :style="{position: 'absolute',top:(405 + (index * 400))  + 'px',left:360+ 'px'}">{{ paramsObj.chargeName }}</div>
+                <div :style="{position: 'absolute',top:(405 + (index * 400))  + 'px',left:520+ 'px'}">
                     <span>{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</span>
                 </div>
-                <div :style="{position: 'absolute',top:(390 + (index * 400))  + 'px',left:560+ 'px'}">
+                <div :style="{position: 'absolute',top:(405 + (index * 400))  + 'px',left:560+ 'px'}">
                     <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(5,7)) : getTime(list.date, '{y}-{m}-{d}').slice(5,7) }}</span>
                 </div>
-                <div :style="{position: 'absolute',top:(390 + (index * 400))  + 'px',left:600+ 'px'}">
+                <div :style="{position: 'absolute',top:(405 + (index * 400))  + 'px',left:600+ 'px'}">
                     <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(8,11)) : getTime(list.date, '{y}-{m}-{d}').slice(8,11) }}</span>
                 </div>
             </div>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

             org_id: this.$store.getters.xt_user.org_id
 
           }
+          if (this.activeName == 'first') {
+            obj['settle_accounts_type'] = 1
+          } else if (this.activeName == 'second') {
+            obj['start_time'] = this.other_start_time
+            obj['end_time'] = this.other_end_time
+            obj['settle_accounts_type'] = 2
+          } else {
+            obj['start_time'] = this.other_start_time_two
+            obj['end_time'] = this.other_end_time_two
+            obj['settle_accounts_type'] = 2
+          }
           axios.get("http://127.0.0.1:9532" + '/nmg/coordinate/settleAccount', {
             params: obj
           })