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

src/xt_pages/data/components/drugTableSon.vue

@@ -389,11 +389,13 @@
         });
       },
       createData() {
-        
+        if(this.temp.code == undefined){
+           this.temp.code = ""
+        }
         this.$refs["dataForm"].validate(valid => {
           if (valid) {
             console.log("33333333",this.temp)
-           
+            
             createDictionaryChildConfig(this.temp).then(response => {
               if (!response.data) {
                 // 由于mockjs 不支持自定义状态码只能这样hack

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -249,7 +249,7 @@
                         <!--"-->
                         <!--&gt;</check-box>-->
                       </div>
-                      <div v-if="org_id == 9987" class="inline_block" style="width:200px;margin-left: 30px;">
+                      <div v-if="org_id == 9987" class="inline_block" style="margin-left: 30px;">
                           透前血压:
                           <span class="under_line" style="width:50px;">
                               &nbsp;{{ record.assessment_before_dislysis.systolic_blood_pressure ? record.assessment_before_dislysis.systolic_blood_pressure : ""}}
@@ -946,9 +946,9 @@
                       </div>
                       <div class="inline_block" style="float: right;">
                         医生签名：
-                        <div class="under-line" v-if="org_id == 9987">
-                          <span v-if="setAdminUserES(record.prescription==null?0:(record.prescription.prescription_doctor?record.prescription.prescription_doctor:record.prescription.creater)) == ''">{{getAdminUser(record.prescription==null?0:(record.prescription.prescription_doctor?record.prescription.prescription_doctor:record.prescription.creater))}}</span>
-                          <img v-else style="height:30px;" :src="setAdminUserES(record.prescription==null?0:(record.prescription.prescription_doctor?record.prescription.prescription_doctor:record.prescription.creater))" alt="" srcset="">
+                        <div class="under_line" v-if="org_id == 9987">
+                          <span v-if="setAdminUserES(record.prescription, record.prescription.prescription_doctor ? 'prescription_doctor' : 'creater') == ''">{{getAdminUser(record.prescription, record.prescription.prescription_doctor ? 'prescription_doctor' : 'creater')}}</span>
+                          <img class="es-img" :src="setAdminUserES(record.prescription, record.prescription.prescription_doctor ? 'prescription_doctor' : 'creater')" alt="" srcset="" v-else style="height: 30px;">
                         </div>
                         <div class="under_line" v-else style="width: 100px;">
                           <span

src/xt_pages/outpatientCharges/treatTemplate/printOne.vue

@@ -117,8 +117,18 @@
                 <div style="display:flex;justify-content: space-between;">
                     <div style="width:20%;">
                         <div class="chargeUl" v-for="(item,index) in 1" :key="index">
-                            <p style="width:50%;">材料费</p>
-                            <p style="width:50%;"></p>
+                            <div>
+                                <p style="width:50%;">药品费</p>
+                                <p style="width:50%;"></p>
+                            </div>
+                            <div>
+                                <p style="width:50%;">材料费</p>
+                                <p style="width:50%;"></p>
+                            </div>
+                            <div>
+                                <p style="width:50%;">治疗费</p>
+                                <p style="width:50%;"></p>
+                            </div>
                         </div>
                         <div class="chargeUl" style="border-top:1px solid #000;">
                             <p style="width:50%;">费用合计</p>

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

@@ -460,4 +460,4 @@ export default {
 .actionBar div{
     width:150px;
 }
-</style>
+</style>

src/xt_pages/stock/detail/stockInDetail.vue

@@ -723,36 +723,43 @@ export default {
         r2 = Number(total.toString().replace('.', ''))
         return r1 * r2 / Math.pow(10, m)
       },
-    
-    exportList(){
-       var obj = {index:"合计",total:0}
-       obj.total = this.calTotalPrice()
-      for(let i=0;i<this.tableList.length;i++){
-        this.tableList[i].index = i+1
-        this.tableList[i].min_unit = this.getUnit(this.tableList[i].good_unit)
-        this.tableList[i].count = this.calCount(this.tableList[i])
-        this.tableList[i].total = this.calTotal(this.tableList[i])
-        this.tableList[i].price = this.tableList[i].query_warehousing_info[0].price
-        this.tableList[i].remark = this.tableList[i].query_warehousing_info[0].remark
+      unique(arr) {
+        const res = new Map();
+        return arr.filter((arr) => !res.has(arr.specification_name) && res.set(arr.specification_name, 1));
+      },
+      exportList(){
+        var obj = {index:"合计",total:0}
+        obj.total = this.calTotalPrice()
+     
+        for(let i=0;i<this.tableList.length;i++){
+          this.tableList[i].index = i+1
+          this.tableList[i].min_unit = this.getUnit(this.tableList[i].good_unit)
+          this.tableList[i].count = this.calCount(this.tableList[i])
+          this.tableList[i].total = this.calTotal(this.tableList[i])
+          this.tableList[i].price = this.tableList[i].query_warehousing_info[0].price
+          this.tableList[i].remark = this.tableList[i].query_warehousing_info[0].remark
 
-       }
-       this.tableList.push(obj)
-       console.log("数据222222",this.tableList)
-    
-       import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
-       const filterVal = ['index','good_name', 'specification_name', 'min_unit','count','price','total','remark']
-       
-       const data = this.formatJson(filterVal, this.tableList)
-       
-        excel.export_json_to_excel({
-           header: tHeader,
-           data,
-           filename: '耗材入库明细'
-         })
-          this.downloadLoading = false
-        })
-       },
+        }
+        var arr = this.unique(this.tableList)
+        console.log("arrrr",arr)
+        this.tableList = arr
+        this.tableList.push(obj)
+        console.log("数据222222",this.tableList)
+      
+        import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
+        const filterVal = ['index','good_name', 'specification_name', 'min_unit','count','price','total','remark']
+        
+        const data = this.formatJson(filterVal, this.tableList)
+        
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: '耗材入库明细'
+          })
+            this.downloadLoading = false
+          })
+        },
      formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
      },

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -709,7 +709,10 @@ export default {
         r2 = Number(total.toString().replace('.', ''))
         return r1 * r2 / Math.pow(10, m)
       },
-
+      unique(arr) {
+        const res = new Map();
+        return arr.filter((arr) => !res.has(arr.specification_name) && res.set(arr.specification_name, 1));
+      },
 
      exportList(){
 
@@ -723,6 +726,9 @@ export default {
         this.tableList[i].total = (this.getStockCount(this.tableList[i].id) * this.tableList[i].query_warehouseout_info[0].price).toFixed(2)
         this.tableList[i].remark = this.tableList[i].query_warehouseout_info[0].remark
        }
+       var arr = this.unique(this.tableList)
+       console.log("22222222222222222气",arr)
+       this.tableList = arr
        this.tableList.push(obj)
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -180,7 +180,7 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100]"
+        :page-sizes="[10, 50, 100,1000]"
         :page-size="10"
         background
         style="margin-top:20px;float: right"