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

src/xt_pages/outpatientCharges/costComparison.vue

             clr_type: '11'
           }
           var that = this
-          if (this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106) {
+          if (this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990 ) {
             axios.get('http://127.0.0.1:9532/api/checkaccount/get', {
               params: params
             })

src/xt_pages/outpatientCharges/newStatementPrint.vue

 
       },
       getInfo(order_id) {
-        if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 ||  this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106) {
+        if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 ||  this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990 ) {
 
           var that = this
 

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

 
             })
 
-        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106) {
+        } else if (this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990  ) {
           var that = this
           axios.get('http://127.0.0.1:9532/api/upload/get', {
             params: form,
 
             })
 
-        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106) {
+        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671  || this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990) {
 
           axios.get('http://127.0.0.1:9532/api/register/get', {
             params: forms,
           }
 
         } else if (index == 5) {
-          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106) {
+
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990 ) {
 
             var that = this
             this.$confirm('是否退费', '退费', {
 
           var that = this
 
-          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106) {
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990) {
             axios.get('http://127.0.0.1:9532/api/checkaccount/get', {
               params: params
             })
             })
         } else if (index == 15) {
           var that = this
-          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 10106) {
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 10106 ||   this.$store.getters.xt_user.org_id == 9990) {
 
             if (this.diagnosis.length || this.diagnosis == 0) {
               that.$message.error('诊断不能为空,请选择诊断内容')
 
           }
           this.loadingtwo = true
-          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106) {
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990) {
             var that = this
             axios.get('http://127.0.0.1:9532/api/pre_upload/get', {
               params: form

src/xt_pages/outpatientCharges/statementPrint.vue

 
     },
     getInfo(order_id) {
-      if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 9671 ||  this.$store.getters.xt_user.org_id == 9674 ||  this.$store.getters.xt_user.org_id == 10106  ||  this.$store.getters.xt_user.org_id == 4) {
+      if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 9671 ||  this.$store.getters.xt_user.org_id == 9674 ||  this.$store.getters.xt_user.org_id == 10106  ||  this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9990) {
 
         var that = this
 

src/xt_pages/outpatientCharges/summary.vue

                     <template slot-scope="scope">
                         <el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>
                         <el-button size="mini" type="primary" @click="toPrint(scope.row)"
-                                   v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9504) || ($store.getters.xt_user.org_id == 9919) ||  ($store.getters.xt_user.org_id == 10106) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 4)">
+                                   v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9504) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9919) ||  ($store.getters.xt_user.org_id == 10106) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 4) || ($store.getters.xt_user.org_id == 9990) ">
                             结算单
                         </el-button>
-                        <el-button size="mini" type="primary" @click="toRefund(scope.row)" v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106)">
+                        <el-button size="mini" type="primary" @click="toRefund(scope.row)" v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106  || $store.getters.xt_user.org_id== 9990)">
                             退费
                         </el-button>
                         <!-- <el-button size="mini" type="primary" @click="invoicePrint(scope.row)">打印发票</el-button> -->
         }
 
       },toRefund(row){
-        if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106) {
+        if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990) {
           var that = this
           this.$confirm('是否退费', '退费', {
             confirmButtonText: '确 定',

src/xt_pages/outpatientRegistration/index.vue

             cb([])
           }
         })
-      }, 
+      },
       readingSZ() {
         var that = this
         if (this.form.id_card_type.length == 0 || this.form.id_card_type == 0) {
                 .catch(function(error) {
 
                 })
-            } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538) {
+            } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9990) {
               var that = this
 
               axios.get('http://127.0.0.1:9532/api/register/get', {
                 .catch(function(error) {
 
                 })
-            } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538) {
+            } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9990) {
               var that = this
 
               axios.get('http://127.0.0.1:9532/api/register/get', {

src/xt_pages/qcd/basicInformationAnalysis.vue

           :picker-options="pickerOptions"
         ></el-date-picker>
       </div>
-       <div class="cell clearfix">
+       <!-- <div class="cell clearfix">
         <label class="title"><span class="name">转归情况</span> : </label>
         <div class="time ">
           <ul class="">
             <li
               :class="item.lapseto == lapsetoType ? 'active' : ''"
-              @click="selectLapseOne(item.lapseto)"
+              @click="selectLapseTo(item.lapseto)"
               v-for="item in lapsetoArr"
               :key="item.value"
             >
             </li>
           </ul>
         </div>
-      </div>
-      <div class="cell clearfix">
+      </div> -->
+      <!-- <div class="cell clearfix">
         <label class="title"><span class="name">病人来源</span> : </label>
         <div class="time ">
           <ul class="">
             </li>
           </ul>
         </div>
-      </div>
+      </div> -->
 
        <div class="cell clearfix" v-show="treatShow">
         <label class="title">
                 <p class="infoTitle">转归统计(总人数{{patientCount}}人)</p>
               </div>
               <div class="borderBox1">
-                 <span v-if="lapsetoType == 0 || lapsetoType == 1"><p>留治:{{rollOutTotal}}人({{(rollOutTotal/patientCount*100).toFixed(1)}}%)</p>
-                  <el-progress :percentage="(rollOutTotal/patientCount*100).toFixed(1)"></el-progress>
-                </span>
-                <span v-if="lapsetoType == 0 || lapsetoType == 2"><p>转出:{{outTotal}}人({{(outTotal/patientCount*100).toFixed(1)}}%)</p>
-                 <el-progress :percentage="(outTotal/patientCount*100).toFixed(1)"></el-progress>
-                </span> 
+                <p>留治:{{rollOutTotal}}人({{(rollOutTotal/patientCount*100).toFixed(1)}}%)</p>
+                <el-progress :percentage="(rollOutTotal/patientCount*100).toFixed(1)"></el-progress>
+                <p>转出:{{outTotal}}人({{(outTotal/patientCount*100).toFixed(1)}}%)</p>
+                <el-progress :percentage="(outTotal/patientCount*100).toFixed(1)"></el-progress>
               </div>
             </div>
             <div class="infoOne">
         </div>
         <div>
 
-        <!-- <div class="cell clearfix" v-show="treatShow">
+        <div class="cell clearfix" v-show="treatShow">
         <label class="title">
           <span class="name">转归状态</span> :
         </label>
             >{{ item.label }}</li>
           </ul>
         </div>
-       </div> -->
+       </div>
 
           <p style="font-size: 16px;font-weight: bold;color: #000;">转归统计</p>
           <line-chart :options="bar"></line-chart>
         { value: 0, label: '全部', source: 0, lapseto: 0 },
         { value: 1, label: '转出', source: 0, lapseto: 2 },
         { value: 2, label: '留治', source: 0, lapseto: 1 },
-        // { value: 3, label: '死亡', source:0,  lapseto: 3 },
+        { value: 3, label: '死亡', source:0,  lapseto: 3 },
       ],
       sourceType: 0,
       sourceArr: [
         //统计转归状态
         this.getTotalLapseCount(this.listQuery.start_time,this.listQuery.end_time,this.lapsetoType,this.sourceType)
         //统计男女比例
-        this.getTotalSexCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
+        this.getTotalSexCount(timeStar,timeEnd)
         //统计传染病
         this.getTotalInfectiousCount(this.listQuery.start_time,this.listQuery.end_time,this.lapsetoType,this.sourceType)
         //统计年龄
         this.start = timeStar
         this.end =timeEnd
         this.getCountModeId()
-        this.getRolloutCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
+        this.getRolloutCount(timeStar,timeEnd)
       }
     },
     changeEndTime(val) {
         this.start = timeStar
         this.end =timeEnd
         this.getCountModeId()
-        this.getRolloutCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
+        this.getRolloutCount(timeStar,timeEnd)
       }
     },
     selectLapseTo(state) {
       //获取本月当前机构的透析模式
       const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
       const endDate = moment(new Date()).format('YYYY-MM-DD')
-     
+
       var now = new Date()
       var nowMonth = now.getMonth(); //当前月
       var nowYear = now.getFullYear(); //当前年
         this.start = timeStar
         this.end = timeEnd
         this.getCountModeId()
-        this.getRolloutCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
+        this.getRolloutCount(timeStar,timeEnd)
       }
       //近三月
       if(state == 1){
         this.listQuery.start_time = ""
         this.listQuery.end_time = ""
         const startDate = moment().subtract('month', 3).format('YYYY-MM-DD')
-       
+
         var startunitx = Date.parse(startDate)/1000
         // console.log("开始时间搓",startunitx)
         const endDate = moment(new Date()).format('YYYY-MM-DD')
         this.start = startunitx
         this.end = endunitx
         this.getCountModeId()
-        this.getRolloutCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
+        this.getRolloutCount(startunitx,endunitx)
       }
 
      //近半年
         this.start = startunitx
         this.end = endunitx
         this.getCountModeId()
-        this.getRolloutCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
+        this.getRolloutCount(startunitx,endunitx)
      }
 
      //近一年
         this.getTotalAgeCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
         //统计透析年龄
         this.getTotalDialysisCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
+
         this.start = startunitx
         this.end = endunitx
         this.getCountModeId()
-        this.getRolloutCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
+        this.getRolloutCount(startunitx,endunitx)
      }
 
 
          if(response.data.state == 1){
 
           var modetype =  response.data.data.modetype
-         
+
           this.modetype = modetype
           var total =  response.data.data.total
-          
-          this.total = total.count
-          // this.total = total
+
+          // this.total = total.count
+          this.total = total
           // console.log("数据",this.modetype)
           var modedate = response.data.data.modetype
           for(let i=0;i<modedate.length;i++){
       })
     },
     //统计转归
-    getTotalLapseCount(startDate,endDate,lapsetoType,sourceType ){
-   
+    getTotalLapseCount(startDate,endDate){
        this.modesDataTwo.series = []
        this.modesDataTwo.xAxis = []
-      getTotalLapseCount(startDate,endDate,lapsetoType,sourceType).then(response=>{
+      getTotalLapseCount(startDate,endDate).then(response=>{
          if(response.data.state == 1){
            var arr = [
              {name:"留治",count:0},
              {name:"转出",count:0}
            ]
           var patients =  response.data.data.patients
-      
-          this.rollOutTotal = patients.length
 
+          this.rollOutTotal = patients.length
           var patienttwo = response.data.data.patienttwo
+
           this.outTotal = patienttwo.length
           var count = response.data.data.count
           this.patientCount = count
 
           var rollout = response.data.data.rollout
-        
+          console.log("rollout",rollout)
 
           for(let i=0;i<arr.length;i++){
             arr[0].count = this.rollOutTotal
             arr[1].count = this.outTotal
           }
+
+          // for(let j=0;j<arr.length;j++){
+          //   this.modesDataTwo.xAxis.push(arr[j].name)
+          //   this.modesDataTwo.series.push(((arr[j].count/count)*100).toFixed(1))
+          // }
+          // this.bar.series[0].data = this.modesDataTwo.series
+          // this.bar.xAxis.data = this.modesDataTwo.xAxis
+          // this.getArrLength(this.bar.xAxis.data)
+
          }
       })
     },
     //统计男女比例
-    getTotalSexCount(timeStar,timeEnd,lapsetoType,sourceType){
-      getTotalSexCount(timeStar,timeEnd,lapsetoType,sourceType).then(response=>{
+    getTotalSexCount(timeStar,timeEnd){
+      getTotalSexCount(timeStar,timeEnd).then(response=>{
         if(response.data.state === 1){
-          console.log("resp2222",response.data.data.totalWoman)
           var total = response.data.data.total
+        //  console.log("总人数",total)
           this.totalGender = total
           var totalMan = response.data.data.totalSex
+       //  console.log("男人",totalMan)
           this.totalMan = totalMan
-          var totalWoman = response.data.data.totalWoman
+          var totalWoman = total - totalMan
           this.totalWoman = totalWoman
         }
       })
     },
     //统计传染病
-    getTotalInfectiousCount(timeStar,timeEnd,lapsetoType,sourceType){
-       getTotalInfectiousCount(timeStar,timeEnd,lapsetoType,sourceType).then(response=>{
+    getTotalInfectiousCount(timeStar,timeEnd){
+       getTotalInfectiousCount(timeStar,timeEnd).then(response=>{
            if(response.data.state === 1){
              this.InfectiousTotal = response.data.data.total
              var infectious = response.data.data.count
            }
        })
     },
-    getTotalAgeCount(timeStar,timeEnd,lapsetoType,sourceType){
-      getTotalAgeCount(timeStar,timeEnd,lapsetoType,sourceType).then(response=>{
+    getTotalAgeCount(timeStar,timeEnd){
+      getTotalAgeCount(timeStar,timeEnd).then(response=>{
          if(response.data.state == 1){
           var ageCount =  response.data.data.ageCount
+          // console.log("ageCount",ageCount)
           var arr = []
           arr =  ageCount.sort(this.compare('age'))
           this.ageCount = arr
           }
       },
     //统计透析年龄
-    getTotalDialysisCount(timeStar,timeEnd,lapsetoType,sourceType){
-      getTotalDialysisCount(timeStar,timeEnd,lapsetoType,sourceType).then(response=>{
+    getTotalDialysisCount(timeStar,timeEnd){
+      getTotalDialysisCount(timeStar,timeEnd).then(response=>{
          if(response.data.state == 1){
            var dataage =  response.data.data.dataage
           //  console.log("dataage",dataage)
        this.modesDataTwo.xAxis = []
         const params = {
           start_time:this.start,
-          end_time:this.end,
-          lapsetotype:this.lapsetoType,
-          sourcetype:this.sourceType,
+          end_time:this.end
         }
       getRolloutCount(params).then(response=>{
          if(response.data.state == 1){
       this.getTotalInfectiousCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
       this.getTotalAgeCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
       this.getTotalDialysisCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
-      this.getRolloutCount(this.lapsetoType,this.sourceType)
     },
-    selectLapseOne(lapseto) {
-      console.log("lapseto22222",lapseto)
+    selectLapseTo(lapseto) {
       this.lapsetoType = lapseto
       this.getDialysisModeType(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
       this.getTotalLapseCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
       this.getTotalInfectiousCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
       this.getTotalAgeCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
       this.getTotalDialysisCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
-      this.getRolloutCount(this.lapsetoType,this.sourceType)
     },
   },
   created() {
       this.start = timeStar
       this.end = timeEnd
 
-     this.getRolloutCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
+     this.getRolloutCount(timeStar,timeEnd)
 
 
   },
 </style>
 
 
+

src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue

           <table class="print-table" border="1">
             <tbody>
             <tr>
-              <td style="line-height: 50px" width="50">序号</td>
-              <td style="line-height: 50px" width="250">药品名称</td>
-              <td style="line-height: 50px" width="250">规格型号</td>
-              <td style="line-height: 50px" width="50">单位</td>
-              <td style="line-height: 50px" width="80">数量</td>
-              <td style="line-height:50px" width="80">单价</td>
-              <td style="line-height:50px" width="80">总价</td>
+              <td width="80">药品名称</td>
+              <td width="80">注册证号/批准文号/备案凭证号</td>
+              <td width="80">规格型号</td>
+              <td width="80">生产厂商</td>
+              <td width="80">单位</td>
+              <td width="80">进货价</td>
+              <td width="80">入库数量</td> 
+              <td width="80">总价</td>
+              <td width="80">批号</td>
+              <td width="80">生产日期</td>
+              <td width="80">有效日期</td>
+              <td width="80">质检意见</td>
+              <td width="80">验收结论</td>
             </tr>
 
             <tr v-for="(item,index) in WarehouseInfo.warehouseInfoDate" :key="item.id">
-              <td style="line-height: 50px">&nbsp;
-                {{index+1}}
-              </td>
               <td style="line-height: 50px">
                  <span v-if="item.drug_id != 0">{{item.drug.drug_name}}</span>
               </td>
+              <td>{{ item.remark }}</td>
               <td style="line-height: 50px">
                  <span v-if="item.drug_id != 0">{{item.drug?item.drug.drug_spec:''}}</span>
               </td>
+              <td>{{ getManufacturer(item.manufacturer) }}</td>
               <td style="line-height: 50px">
                 <span>{{getUnit(item.drug_id)}}</span>
               </td>
-            
+              <td style="line-height:50px">
+                  {{item.price}}
+              </td>
               <td style="line-height: 50px">
                    <span>{{ item.warehousing_count }}</span>
               </td>
+              
               <td style="line-height:50px">
-                  {{item.price}}
+                  <span>{{(item.warehousing_count * item.price).toFixed(2)}}</span>
               </td>
-             <td style="line-height:50px">
-                <span>{{(item.warehousing_count * item.price).toFixed(2)}}</span>
-             </td>
+              <td>{{ item.number }}</td>
+              <td>{{ item.product_date | parseTime("{y}-{m}-{d}") }}</td>
+              <td>{{ item.expiry_date | parseTime("{y}-{m}-{d}") }}</td>
+              <td>正常入库</td>
+              <td>合格</td>
             </tr>
             <tr>
               <td>合计</td>
-              <td colspan="5"></td>
+              <td colspan="11"></td>
               <td>{{allPrice.toFixed(2)}}</td>
             </tr>
             </tbody>
 </template>
 
 <script>
-  import { getPrintStockGood } from '@/api/stock'
+  import { GetAllConfig,getPrintStockGood } from '@/api/stock'
   import { getDataConfig } from '@/utils/data'
   import { jsGetAge, uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
         }
         return name
       },
+      getManufacturer(id){
+        let name = ''
+        this.manufacturer.map(item => {
+          if(item.id == id){
+            name = item.manufacturer_name
+          }
+        })
+        return name
+      },
+      GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+            if (response.data.state == 0) {
+            this.$message.error(response.data.msg);
+            return false;
+            } else {
+            this.manufacturer = response.data.data.manufacturer;
+            }
+        });
+      },
     },
     created() {
+      this.GetConfigInfo()
       const order_id = this.$route.query.id;
       this.GetOrderDetail(order_id);
       this.getList()
+      
     }
 
   }

src/xt_pages/stock/stockInOrderDetailPrint.vue

                                     <td width="80">规格型号</td>
                                     <td width="80">生产厂商</td>
                                     <td width="80">单位</td>
-                                     <td width="80">进货价</td>
+                                    <td width="80">进货价</td>
                                     <td width="80">入库数量</td> 
                                     <td width="80">总价</td>
                                     <td width="80">批号</td>
                             <tbody>
                                 <tr v-for='(item,index) in WarehouseInfo.warehouseInfoDate' :key="index">
                                     <td><span v-if="item.good_id != 0">{{getTypeNameOne(item.good_id)}}</span></td>
-                                    <td></td>
+                                    <td>{{ item.remark }}</td>
                                     <td><span v-if="item.good_id != 0">{{getSpecificationName(item.good_id)}}</span></td>
                                     <td>{{ getManufacturer(item.manufacturer) }}</td>
                                     <td><span v-if="item.good_id!=0">{{getUnit(item.good_id)}}</span></td>
                                     <td>{{ item.number }}</td>
                                     <td>{{ item.product_date | parseTime("{y}-{m}-{d}") }}</td>
                                     <td>{{ item.expiry_date | parseTime("{y}-{m}-{d}") }}</td>
-                                    <td></td>
-                                    <td></td>
+                                    <td>正常入库</td>
+                                    <td>合格</td>
                                 </tr>
                                 <tr>
                                   <td>合计</td>

src/xt_pages/upload/fast/One.vue

       <div class="information">
         <div class="row">
           <div class="rowOne">
-            <p class="rowName">首次诊治时间:</p>
+            <p class="rowName">首次透析时间:</p>
             <el-input
               placeholder="请输入内容"
               v-model="form.first_treatment_date"

src/xt_pages/user/components/PatientForm.vue

             </el-col>
 
             <el-col :span="6" :style="isEdit ? 'width:360px' : ''">
-              <el-form-item label="首次诊治时间 : ">
+              <el-form-item label="首次透析时间 : ">
                 <el-date-picker
                   v-model="form.first_treatment_date"
                   type="date"