Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/icons/svg/sign.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1509611822979" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10379" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><defs><style type="text/css"></style></defs><path d="M219.428571 658.285714q0-30.285714-21.428571-51.714285T146.285714 585.142857t-51.714285 21.428572T73.142857 658.285714t21.428572 51.714286T146.285714 731.428571t51.714286-21.428571T219.428571 658.285714z m109.714286-256q0-30.285714-21.428571-51.714285T256 329.142857t-51.714286 21.428572T182.857143 402.285714t21.428571 51.714286T256 475.428571t51.714286-21.428571T329.142857 402.285714z m244.571429 274.857143l57.714285-218.285714q3.428571-14.857143-4.285714-27.714286T605.142857 414.285714t-27.428571 3.714286-17.142857 22.571429l-57.714286 218.285714q-34.285714 2.857143-61.142857 24.857143t-36 56.285714q-11.428571 44 11.428571 83.428571t66.857143 50.857143 83.428571-11.428571 50.857143-66.857143q9.142857-34.285714-3.428571-66.857143t-41.142857-52z m377.142857-18.857143q0-30.285714-21.428572-51.714285T877.714286 585.142857t-51.714286 21.428572-21.428571 51.714285 21.428571 51.714286 51.714286 21.428571 51.714285-21.428571 21.428572-51.714286z m-365.714286-365.714285q0-30.285714-21.428571-51.714286T512 219.428571t-51.714286 21.428572T438.857143 292.571429t21.428571 51.714285T512 365.714286t51.714286-21.428572T585.142857 292.571429z m256 109.714285q0-30.285714-21.428571-51.714285T768 329.142857t-51.714286 21.428572T694.857143 402.285714t21.428571 51.714286T768 475.428571t51.714286-21.428571T841.142857 402.285714z m182.857143 256q0 149.142857-80.571429 276-10.857143 16.571429-30.857142 16.571429H111.428571q-20 0-30.857142-16.571429Q0 808 0 658.285714q0-104 40.571429-198.857143t109.142857-163.428571 163.428571-109.142857 198.857143-40.571429 198.857143 40.571429 163.428571 109.142857 109.142857 163.428571 40.571429 198.857143z" p-id="10380"></path></svg>

src/xt_pages/data/components/tableson.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="">
     <div class="filter-container">
-      <el-button style="float: right" class="filter-item" size="small" :disabled="addState"  @click="handleCreate" type="primary" icon="el-icon-circle-plus-outline">{{$t('table.add')}}</el-button>
+      <el-button style="float: right;margin-right: 40px" class="filter-item" size="small" :disabled="addState"  @click="handleCreate" type="primary" icon="el-icon-circle-plus-outline">{{$t('table.add')}}</el-button>
     </div>
 
     <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :key='tableKey' :data="list" v-loading="listLoading" border fit highlight-current-row
-      style="width: 100%;min-height:500px;">
+      style="width: 100%;">
       <el-table-column  align="center" label="名称">
         <template slot-scope="scope">
           <span @click="handleUpdate(scope.row)">{{scope.row.name}}</span>

src/xt_pages/data/components/templateTable.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="">
     <div class="filter-container">
-      <el-button size="small" class="filter-item" style="float:right;" @click="handleCreate" type="primary" icon="el-icon-circle-plus-outline">{{$t('table.add')}}</el-button>
+      <el-button size="small" class="filter-item" style="float:right;margin-right: 30px" @click="handleCreate" type="primary" icon="el-icon-circle-plus-outline">{{$t('table.add')}}</el-button>
     </div>
     <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :key='tableKey' :data="list" v-loading="listLoading" border fit highlight-current-row style="width: 100%;min-height:500px;">
       <!-- <el-table-column align="center" :label="$t('table.id')" width="65" @click="handleUpdate(scope.row)">

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -89,7 +89,11 @@
         <el-table-column prop="number" label="机号" align="center"></el-table-column>
         <el-table-column label="排班日期" prop="sch_time" align="center" width="120"></el-table-column>
         <el-table-column prop="dialysis_no" label="透析号" align="center"></el-table-column>
-        <el-table-column prop="name" label="姓名" align="center"></el-table-column>
+        <el-table-column prop="name" label="姓名" align="center">
+          <template slot-scope="scope">
+            <span style="color: #579ef8">{{scope.row.name}}</span>
+          </template>
+        </el-table-column>
 
         <el-table-column prop="mode_name" label="透析模式" align="center"></el-table-column>
 
@@ -455,4 +459,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/xt_pages/stock/Dialog/salesReturnDialog.vue

@@ -15,6 +15,8 @@
           border
           highlight-current-row
           max-height="250"
+          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+
           @current-change="goodTypeTableChange"
           style="width: 100%">
           <el-table-column
@@ -30,6 +32,8 @@
           ref="multipleTable"
           max-height="250"
           @row-click="clickRow"
+          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+
           @selection-change="changeGoodInfoTableData"
           @select-all="changeAllGoodInfoTableData"
           row-key="row_key"

src/xt_pages/stock/Dialog/stockInDialog.vue

@@ -16,6 +16,7 @@
           highlight-current-row
           max-height="250"
           @current-change="goodTypeTableChange"
+          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
           style="width: 100%">
           <el-table-column
             prop="type_name"
@@ -34,6 +35,7 @@
           @select-all="changeAllGoodInfoTableData"
           row-key="row_key"
           style="width: 100%"
+          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
         >
           <el-table-column
             type="selection"

src/xt_pages/stock/stockInOrderAdd.vue

@@ -467,34 +467,37 @@
           this.$message.error('请先选择厂商')
           return
         } else {
+          this.$refs.dialog.show()
 
           // this.isVisibility = true
-          const params = {
-            id: this.form.manufacturer
-          }
-          this.propForm.goodType = []
-          GetAllGoodInfoByID(params).then(response => {
-            if (response.data.state == 0) {
-              this.$message.error(response.data.msg)
-              return false
-            } else {
-              if (response.data.data.goodInfo.length == 0) {
-                this.$message.error('该厂商没商品，请添加商品')
-              } else {
-                for (let i = 0; i < response.data.data.goodInfo.length; i++) {
-                  this.propForm.goodType.push(response.data.data.goodInfo[i].GoodsType)
-                }
-
-                const obj = {}
-                this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-                  obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
-                  return cur
-                }, []) // 设置cur默认类型为数组，并且初始值为空的数组
-                this.$refs.dialog.show()
-
-              }
-            }
-          })
+          // const params = {
+          //   id: this.form.manufacturer
+          // }
+          this.propForm.goodType = this.goodType
+          //
+
+
+          // GetAllGoodInfoByID(params).then(response => {
+          //   if (response.data.state == 0) {
+          //     this.$message.error(response.data.msg)
+          //     return false
+          //   } else {
+          //     if (response.data.data.goodInfo.length == 0) {
+          //       this.$message.error('该厂商没商品，请添加商品')
+          //     } else {
+          //       for (let i = 0; i < response.data.data.goodInfo.length; i++) {
+          //         this.propForm.goodType.push(response.data.data.goodInfo[i].GoodsType)
+          //       }
+          //
+          //       const obj = {}
+          //       this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+          //         obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
+          //         return cur
+          //       }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+          //
+          //     }
+          //   }
+          // })
         }
       }, getSummaries(param) {
         const { columns, data } = param

src/xt_pages/stock/stockInOrderEdit.vue

@@ -385,21 +385,8 @@ export default {
               this.$message.error(response.data.msg)
               return false
             } else {
-              if (response.data.data.goodInfo.length == 0) {
-                this.$message.error('该厂商没商品，请添加商品')
-              } else {
-                for (let i = 0; i < response.data.data.goodInfo.length; i++) {
-                  this.propForm.goodType.push(response.data.data.goodInfo[i].GoodsType)
-                }
-
-                const obj = {}
-                this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-                  obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
-                  return cur
-                }, []) // 设置cur默认类型为数组，并且初始值为空的数组
-                this.$refs.dialog.show()
-
-              }
+              this.propForm.goodType = this.goodType
+              this.$refs.dialog.show()
             }
           })
         }

src/xt_pages/user/dialysisRecord.vue

@@ -4,7 +4,7 @@
    <patient-sidebar :id="patientID" defaultActive="2-2" v-on:tran-patient="onTranPatient"></patient-sidebar>
     <div class="patient-app-container app-container">
         <div style="clearfix">
-          <el-button style="float:right;" size="small" @click="printThisInfo()" type="primary" icon="el-icon-printer" >打印</el-button>          
+          <el-button style="float:right;" size="small" @click="printThisInfo()" type="primary" icon="el-icon-printer" >打印</el-button>
           <el-form ref="form"  :model="queryParams" label-width="80px" >
             <!-- <el-form-item label="患者时间 : " >
               <el-select v-model="form.date"   >
@@ -21,20 +21,20 @@
                       <el-date-picker size="small"   type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择结束时间" style="width:150px" v-model="queryParams.end_time" @change="changeSearch" ></el-date-picker>
                     <!-- </el-col> -->
               </el-form-item>
-            </el-col>   
-            <el-col :span="20">     
+            </el-col>
+            <el-col :span="20">
               <el-form-item label="透析模式 : "  >
                 <el-select v-model="queryParams.mode_id" @change="changeSearch" clearable style="width:314px" size="small" >
                 <el-option v-for="item in modeOptions " :label="item.name" :value="item.id" :key="item.id" ></el-option>
                 </el-select>
               </el-form-item>
-            </el-col>       
+            </el-col>
           </el-form>
         </div>
         <div>
           <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :data="recordData" border style="width: 100%" @current-change="clickCurrent">
               <el-table-column prop="dialysis_date" label="透析日期" align="center" width="110" fixed>
-                <template slot-scope="scope"><span>{{scope.row.dialysis_date | parseTime('{y}-{m}-{d}')}}</span></template>
+                <template slot-scope="scope"><span style="color: #579ef8">{{scope.row.dialysis_date | parseTime('{y}-{m}-{d}')}}</span></template>
               </el-table-column>
               <el-table-column prop="schedule_type" label="班次" align="center" width="80">
                 <template slot-scope="scope"><span>{{scheduleType(scope.row.schedule_type)}}</span></template>