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

src/icons/svg/dashboard.svg

@@ -1 +1 @@
-<?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="1559126278025" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4738" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M553.86203002 156.61769104a59.43740844 59.43740844 0 0 0-79.86785887 0L151.037323 463.27838135a29.79286192 29.79286192 0 0 0 39.89685059 44.25361632l5.13542175-4.87586974V822.72082519a59.58572388 59.58572388 0 0 0 59.58572388 59.6598816h173.39927672v-179.3875122a41.95472718 41.95472718 0 0 1 41.97326661-42.01034547h81.59202576a41.95472718 41.95472718 0 0 1 41.97326659 42.01034547v179.3875122h177.51502992a59.58572388 59.58572388 0 0 0 59.6042633-59.6598816V506.56794739c13.2371521 11.97647094 32.01759338 11.06803894 43.03001403-1.20506286a29.79286192 29.79286192 0 0 0-2.15057372-42.08450318L553.86203002 156.63623047z" fill="#333333" p-id="4739"></path></svg>
+<?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="1559132638469" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1438" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M563.197497 0 460.802503 0 0.012259 486.388227c0 0 0.901006 102.396016 51.200051 102.396016s76.797012 0 76.797012 0 0 232.496449 0 332.816677c0 100.300818 102.397038 102.399081 102.397038 102.399081l204.79714 0c0 0 0-272.419617 0-358.416702 0-25.647017 25.600026-25.600026 25.600026-25.600026l102.394994 0c0 0 25.601047 0.851972 25.601047 25.600026 0 92.198911 0 358.416702 0 358.416702s99.647027 0 204.795097 0c105.147048 0 102.398059-102.399081 102.398059-102.399081L895.992721 563.185239c0 0 27.19875 0 76.799055 0 49.59724 0 51.195965-76.79599 51.195965-76.79599L563.197497 0z" p-id="1439" fill="#bfcbd9"></path></svg>

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/styles/index.scss

@@ -318,8 +318,8 @@ code {
 }
 
 .NoData {
-  width: 200px;
-  margin: 0 auto;
+  width: 180px;
+  margin: 40px auto;
   img {
     width: 100%;
   }

src/views/layout/components/TagsView.vue

@@ -132,6 +132,7 @@ export default {
     position: fixed;
     z-index: 2004;
     top: 60px;
+    overflow-x: scroll;
     .tags-view-item {
       display: inline-block;
       position: relative;

src/views/login/index.vue

@@ -1,8 +1,6 @@
 <template>
   <div class="login-container">
-
     <el-form class="login-form" autoComplete="on" :model="loginForm" :rules="loginRules" ref="loginForm" label-position="left">
-
       <div class="title-container">
         <h3 class="title">{{$t('login.title')}}</h3>
         <lang-select class="set-language"></lang-select>

src/views/table/complexTable.vue

@@ -84,7 +84,7 @@
     </div>
 
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
-      <el-form :rules="rules" ref="dataForm" :model="temp" label-position="left" label-width="70px" style='width: 400px; margin-left:50px;'>
+      <el-form :rules="rules" ref="dataForm" :model="temp"  label-width="70px" style='width: 400px; margin-left:50px;'>
         <el-form-item :label="$t('table.type')" prop="type">
           <el-select class="filter-item" v-model="temp.type" placeholder="Please select">
             <el-option v-for="item in  calendarTypeOptions" :key="item.key" :label="item.display_name" :value="item.key">

src/xt_pages/data/components/table.vue

@@ -16,7 +16,7 @@
     </el-table>
 
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
-      <el-form :rules="rules" ref="dataForm" :model="temp" label-position="left" label-width="70px" style='width: 500px; margin-left:50px;'>
+      <el-form :rules="rules" ref="dataForm" :model="temp" label-width="70px" style='width: 500px; margin-left:50px;'>
         <el-form-item :label="$t('data_config.config_name')"  prop="config_name">
           <el-input v-model="temp.name" placeholder="请输入名称"></el-input>
         </el-form-item>

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/dialysis/details/dialog/DoctorAdviceDialog.vue

@@ -205,14 +205,12 @@
     <el-dialog
       title="选择执行时间"
       :visible.sync="execTimeDialogVisible"
-      width="30%"
+      width="400px"
       @close="closeTimePanel"
-
       :show-close="isClose"
       :close-on-click-modal="isClose"
       :close-on-press-escape="isClose"
-
-      center>
+      >
       <el-date-picker
         v-model="execTime"
         format="yyyy-MM-dd HH:mm:00"

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="user-edit-group-advice">
-    <el-dialog title="新增医嘱" :visible.sync="groupAddFormVisible" width="854px">
+    <el-dialog title="新增医嘱" :visible.sync="groupAddFormVisible" width="700px">
       <el-form ref="groupForm" :rules="groupRules" :model="groupForm" label-width="90px">
 
         <el-row>
@@ -11,13 +11,14 @@
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="开始时间 :" required prop="start_time">
+            <el-form-item label="开始时间 :" required prop="start_time" style="width:100%;">
               <el-date-picker
                 type="datetime"
                 format="yyyy-MM-dd HH:mm:ss"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="选择时间"
                 v-model="groupForm.start_time"
+                style="width:100%;"
               ></el-date-picker>
             </el-form-item>
           </el-col>
@@ -41,72 +42,32 @@
           </el-col>
         </el-row>
 
-        <el-row style="margin-bottom: 20px;margin-top: 20px">
+        <el-row >
+          <el-col :span="2">
+            &nbsp;&nbsp;
+          </el-col>  
           <el-col :span="5">
-            <!--<el-button-->
-            <!--:disabled="$store.getters.xt_user.subscibe.state==3?true:false"-->
-            <!--type="primary"-->
-            <!--@click="openAdviceTemplate()"-->
-            <!--&gt;选择医嘱模板</el-button>-->
-
             <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round
                        @click="openAdviceTemplate()">选择医嘱模板
             </el-button>
-
-
           </el-col>
-          <!-- <el-col :span="1">&nbsp;</el-col> -->
           <el-col :span="5">
-            <!--<el-button-->
-            <!--:disabled="$store.getters.xt_user.subscibe.state==3?true:false"-->
-            <!--type="primary"-->
-            <!--@click="openGroupAdvice(0)"-->
-            <!--&gt;新增医嘱内容</el-button>-->
-
             <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round
                        @click="openGroupAdvice(0)">新增医嘱内容
             </el-button>
-
           </el-col>
-          <!-- <el-col :span="1">&nbsp;</el-col> -->
           <el-col :span="5">
-            <!--<el-button-->
-            <!--:disabled="$store.getters.xt_user.subscibe.state==3?true:false"-->
-            <!--type="primary"-->
-            <!--@click="openGroupAdvice(1)"-->
-            <!--&gt;修改医嘱内容</el-button>-->
-
             <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round
                        @click="openGroupAdvice(1)">修改医嘱内容
             </el-button>
 
           </el-col>
-
-          <!-- <el-col :span="1">&nbsp;</el-col> -->
           <el-col :span="5">
-            <!--<el-button-->
-            <!--:disabled="$store.getters.xt_user.subscibe.state==3?true:false"-->
-            <!--type="primary"-->
-            <!--@click="openDeleteGroupAdvice()"-->
-            <!--&gt;删除医嘱内容</el-button>-->
-
             <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round
                        @click="openDeleteGroupAdvice()">删除医嘱内容
             </el-button>
-
           </el-col>
-
-          <!-- <el-col :span="1">&nbsp;</el-col>
-          <el-col :span="4">
-            <el-button
-              :disabled="$store.getters.xt_user.subscibe.state==3?true:false"
-              type="primary"
-              @click="openGroupChild()"
-            >添加子药内容</el-button>
-          </el-col> -->
         </el-row>
-
-
         <el-row>
           <el-col :span="24">
             <el-table

src/xt_pages/dialysis/details/dialog/adviceDialog/EditGroupAdvice.vue

@@ -37,9 +37,8 @@
           </el-col>
         </el-row>
 
-        <el-row style="margin-bottom: 20px">
-
-
+        <el-row>
+          <el-col :span="2">&nbsp;&nbsp;</el-col>          
           <el-col :span="5">
             <el-button
               :disabled="$store.getters.xt_user.subscibe.state==3?true:false"
@@ -48,39 +47,16 @@
             >选择医嘱模板
             </el-button>
           </el-col>
-          <el-col :span="1">&nbsp;</el-col>
-
-
           <el-col :span="5">
-            <!--<el-button-->
-            <!--:disabled="$store.getters.xt_user.subscibe.state==3?true:false"-->
-            <!--type="primary"-->
-            <!--@click="openGroupAdvice(0)"-->
-            <!--&gt;新增医嘱内容</el-button>-->
-
             <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round
                        @click="openGroupAdvice(0)">新增医嘱内容
             </el-button>
-
-
           </el-col>
-          <el-col :span="1">&nbsp;</el-col>
-
-
           <el-col :span="5">
             <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round
                        @click="openGroupAdvice(1)">修改医嘱内容
             </el-button>
-
-            <!--<el-button-->
-            <!--:disabled="$store.getters.xt_user.subscibe.state==3?true:false"-->
-            <!--type="primary"-->
-            <!--@click="openGroupAdvice(1)"-->
-            <!--&gt;修改医嘱内容</el-button>-->
           </el-col>
-          <el-col :span="1">&nbsp;</el-col>
-
-
           <el-col :span="5">
             <el-button
               :disabled="$store.getters.xt_user.subscibe.state==3?true:false"
@@ -89,16 +65,6 @@
             >删除医嘱内容
             </el-button>
           </el-col>
-          <el-col :span="1">&nbsp;</el-col>
-
-          <!-- <el-col :span="1">&nbsp;</el-col>
-          <el-col :span="4">
-            <el-button
-              :disabled="$store.getters.xt_user.subscibe.state==3?true:false"
-              type="primary"
-              @click="openGroupChild()"
-            >添加子药内容</el-button>
-          </el-col> -->
         </el-row>
 
 
@@ -389,7 +355,7 @@
                 allow-create
                 :disabled="isChild"
                 placeholder="请选择(输入可搜索)"
-                style="width:90%"
+                style="width:100%"
               >
                 <el-option
                   v-for="item in deliveryWayOptions"
@@ -409,7 +375,7 @@
                 allow-create
                 :disabled="isChild"
                 placeholder="请选择(输入可搜索)"
-                style="width:90%"
+                style="width:100%"
               >
                 <el-option
                   v-for="item in executionFrequencyOptions"

src/xt_pages/dialysis/schedualPatient.vue

@@ -17,8 +17,7 @@
       <label class="title"><span class="name">排班班次</span> : </label>
       <div class="time ">
         <ul class="">
-          <li v-for="option in schedule_type_options" :key="option.value" @click="handletimeType(option.value)" :class="schedule_type_selected == option.value ? 'active' : ''" >
-            {{option.text}}
+          <li v-for="option in schedule_type_options" :key="option.value" @click="handletimeType(option.value)" :class="schedule_type_selected == option.value ? 'active' : ''" >{{option.text}}
           </li>
         </ul>
       </div>
@@ -346,8 +345,5 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
       }
     }
   }
-  .NoData {
-    text-align: center;
-  }
 </style>
 

src/xt_pages/home/modify_user_info_dialog.vue

@@ -1,15 +1,15 @@
 <template>
     <div>
-        <el-dialog title="修改个人信息" width="50%" top="10vh" :visible.sync="visible" :before-close="_close">
-            <el-form ref="form" :model="form" label-position="left" :rules="rules" label-width="80px" 
+        <el-dialog title="修改个人信息" modal-append-to-body="false" append-to-body="true" width="50%" :visible.sync="visible" :before-close="_close">
+            <el-form ref="form" :model="form"  :rules="rules" label-width="80px" 
                     v-loading="uploading">
-                <el-form-item label="账号">
+                <el-form-item label="账号:">
                     <span>{{ this.$store.getters.xt_user.user.mobile }}</span>
                 </el-form-item>
-                <el-form-item label="姓名" prop="user_name">
+                <el-form-item label="姓名:" prop="user_name">
                     <el-input v-model="form.user_name" style="width: 300px;"></el-input>
                 </el-form-item>
-                <el-form-item label="头像">
+                <el-form-item label="头像:">
                     <el-upload  
                     style="width:100%;"
                     :data="qn_upload_data"
@@ -27,29 +27,29 @@
                     </el-upload>
                     <span style="display: block; font-size: 11px; color: gray">仅支持JPG/PNG/JPEG， 大小在300K以内</span>
                 </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="submitAction">确定</el-button>
-                    <el-button type="primary" @click="modifyPwdAction">修改密码</el-button>
-                </el-form-item>
             </el-form>
+            <div slot="footer" class="dialog-footer">
+                    <el-button type="primary" @click="submitAction">保存</el-button>
+                    <el-button type="primary" @click="modifyPwdAction">修改密码</el-button>
+            </div>
         </el-dialog>
 
-        <el-dialog title="修改密码" append-to-body :visible.sync="pwd_dialog_visible">
+        <el-dialog title="修改密码" modal-append-to-body="false" append-to-body="true" :visible.sync="pwd_dialog_visible">
             <el-form ref="pwd_form" :model="pwd_form" label-width="80px">
-                <el-form-item label="账号">
+                <el-form-item label="账号:">
                     <span>{{ this.$store.getters.xt_user.user.mobile }}</span>
                 </el-form-item>
-                <el-form-item label="新密码" prop="new_password">
+                <el-form-item label="新密码:" prop="new_password">
                     <el-input v-model="pwd_form.new_password" style="width: 260px;"></el-input>
                 </el-form-item>
-                <el-form-item label="验证码" prop="code">
+                <el-form-item label="验证码:" prop="code">
                     <el-input v-model="pwd_form.code" style="width: 135px;"></el-input>
                     <el-button :type="count_downing ? 'info' : 'primary'" :disabled="count_downing" @click="getCodeAction" style="width: 122px; padding-left: 5px; padding-right: 5px;">{{ code_btn_title }}</el-button>
                 </el-form-item>
-                <el-form-item>
-                    <el-button :loading="modify_pwd_loading" type="primary" @click="submitModifyPwdAction">确定</el-button>
-                </el-form-item>
             </el-form>
+            <div slot="footer" class="dialog-footer">
+                    <el-button :loading="modify_pwd_loading" type="primary" @click="submitModifyPwdAction">保存</el-button>
+            </div>
         </el-dialog>
     </div>
 </template>

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/config/dealer.vue

@@ -97,108 +97,108 @@
 </template>
 
 <script>
-  import manufacturerOrDealerDialog from '../Dialog/manufacturerOrDealerDialog'
-  import {
-    createDealer,
-    modifyDealer,
-    getDealersList,
-    deleteDealer,
-    GetDealer
-  } from "@/api/stock";
-
-  export default {
-    components: {
-      manufacturerOrDealerDialog
-    },
-    name: "dealer",
-    data() {
-      return {
-        thedefaultActive:'1-2',
-        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
-        dealerData: [],
-        total: 0,
-        pageTotal: 0,
-        pageSelect: 0,
-        page: 1,
-        limit: 7,
-
-        loading:false,
-
-        dealer_code: '',
-        editId: '',
-        editIndex:'',
-        dealerDialog: {
-          titles: '新增经销商',
-          isVisibility: false,
-          type: 1, //1.经销商 2.厂家
-          isCreated: 1, //1.创建 2.编辑 3.查看详情
-          formValue: {
-            manufacturer_name: '',
-            dealer_name: '',
-            contact: '',
-            contact_phone: '',
-            platform_number: '',
-            email: '',
-            contact_address: '',
-            remark: '',
-          },
-          resetForm: {
-            manufacturer_name: '',
-            dealer_name: '',
-            contact: '',
-            contact_phone: '',
-            platform_number: '',
-            email: '',
-            contact_address: '',
-            remark: '',
-          },
+import manufacturerOrDealerDialog from "../Dialog/manufacturerOrDealerDialog";
+import {
+  createDealer,
+  modifyDealer,
+  getDealersList,
+  deleteDealer,
+  GetDealer
+} from "@/api/stock";
+
+export default {
+  components: {
+    manufacturerOrDealerDialog
+  },
+  name: "dealer",
+  data() {
+    return {
+      thedefaultActive: "1-2",
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      dealerData: [],
+      total: 0,
+      pageTotal: 0,
+      pageSelect: 0,
+      page: 1,
+      limit: 7,
+
+      loading: false,
+
+      dealer_code: "",
+      editId: "",
+      editIndex: "",
+      dealerDialog: {
+        titles: "新增经销商",
+        isVisibility: false,
+        type: 1, //1.经销商 2.厂家
+        isCreated: 1, //1.创建 2.编辑 3.查看详情
+        formValue: {
+          manufacturer_name: "",
+          dealer_name: "",
+          contact: "",
+          contact_phone: "",
+          platform_number: "",
+          email: "",
+          contact_address: "",
+          remark: ""
+        },
+        resetForm: {
+          manufacturer_name: "",
+          dealer_name: "",
+          contact: "",
+          contact_phone: "",
+          platform_number: "",
+          email: "",
+          contact_address: "",
+          remark: ""
         }
-
-
+      }
+    };
+  },
+  methods: {
+    handleEdit: function(index, row) {
+      this.editId = row.id;
+      this.editIndex = index;
+      let params = {
+        id: row.id
       };
-    },
-    methods: {
-      handleEdit: function (index, row) {
-        this.editId = row.id
-        this.editIndex = index
-        let params = {
-          id: row.id
+      this.loading = true;
+      GetDealer(params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          this.loading = false;
+          return false;
+        } else {
+          this.loading = false;
+          this.dealerDialog.formValue.dealer_name =
+            response.data.data.dealer.dealer_name;
+          this.dealerDialog.formValue.contact =
+            response.data.data.dealer.contact;
+          this.dealerDialog.formValue.contact_phone =
+            response.data.data.dealer.contact_phone;
+          this.dealerDialog.formValue.platform_number =
+            response.data.data.dealer.platform_number;
+          this.dealerDialog.formValue.email = response.data.data.dealer.email;
+          this.dealerDialog.formValue.contact_address =
+            response.data.data.dealer.contact_address;
+          this.dealerDialog.formValue.remark = response.data.data.dealer.remark;
+          this.dealerDialog.isCreated = 2;
+          this.$refs.dialog.show();
+
+          this.dealer_code = response.data.data.dealer.dealer_code;
         }
-        this.loading = true
-        GetDealer(params).then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            this.loading = false
-            return false;
-          } else {
-            this.loading = false
-            this.dealerDialog.formValue.dealer_name = response.data.data.dealer.dealer_name
-            this.dealerDialog.formValue.contact = response.data.data.dealer.contact
-            this.dealerDialog.formValue.contact_phone = response.data.data.dealer.contact_phone
-            this.dealerDialog.formValue.platform_number = response.data.data.dealer.platform_number
-            this.dealerDialog.formValue.email = response.data.data.dealer.email
-            this.dealerDialog.formValue.contact_address = response.data.data.dealer.contact_address
-            this.dealerDialog.formValue.remark = response.data.data.dealer.remark
-            this.dealerDialog.isCreated = 2
-            this.$refs.dialog.show()
-
-            this.dealer_code = response.data.data.dealer.dealer_code
-
-          }
-        });
-
-      },
-      handleDelete: function (index, row) {
-
-
-        this.$confirm('确认删除这条经销商信息?', '删除经销商信息', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
+      });
+    },
+    handleDelete: function(index, row) {
+      this.$confirm("确认删除这条经销商信息?", "删除经销商信息", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
           let params = {
             id: row.id
-          }
+          };
 
           deleteDealer(params).then(response => {
             if (response.data.state == 0) {
@@ -207,192 +207,176 @@
             } else {
               this.dealerData.splice(index, 1);
 
-              this.$message.success("删除成功")
+              this.$message.success("删除成功");
             }
           });
-        }).catch(() => {
-        });
-
+        })
+        .catch(() => {});
+    },
+    showDetails: function(index, row) {
+      let params = {
+        id: row.id
+      };
+      GetDealer(params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.dealerDialog.formValue.dealer_name =
+            response.data.data.dealer.dealer_name;
+          this.dealerDialog.formValue.contact =
+            response.data.data.dealer.contact;
+          this.dealerDialog.formValue.contact_phone =
+            response.data.data.dealer.contact_phone;
+          this.dealerDialog.formValue.platform_number =
+            response.data.data.dealer.platform_number;
+          this.dealerDialog.formValue.email = response.data.data.dealer.email;
+          this.dealerDialog.formValue.contact_address =
+            response.data.data.dealer.contact_address;
+          this.dealerDialog.formValue.remark = response.data.data.dealer.remark;
+          this.dealerDialog.isCreated = 3;
+          this.dealerDialog.isVisibility = true;
+        }
+      });
+    },
+    manufacturerDialogComfirm: function(val) {
+      this.$refs.dialog.hide();
 
-      },
-      showDetails: function (index, row) {
+      if (val.isCreated == 2) {
+        //修改
         let params = {
-          id: row.id
-        }
-        GetDealer(params).then(response => {
+          dealer_name: val.dealer_name,
+          contact: val.contact,
+          contact_phone: val.contact_phone,
+          platform_number: val.platform_number,
+          email: val.email,
+          contact_address: val.contact_address,
+          remark: val.remark,
+          dealer_code: this.dealer_code,
+          id: this.editId
+        };
+        modifyDealer(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg);
             return false;
           } else {
-            this.dealerDialog.formValue.dealer_name = response.data.data.dealer.dealer_name
-            this.dealerDialog.formValue.contact = response.data.data.dealer.contact
-            this.dealerDialog.formValue.contact_phone = response.data.data.dealer.contact_phone
-            this.dealerDialog.formValue.platform_number = response.data.data.dealer.platform_number
-            this.dealerDialog.formValue.email = response.data.data.dealer.email
-            this.dealerDialog.formValue.contact_address = response.data.data.dealer.contact_address
-            this.dealerDialog.formValue.remark = response.data.data.dealer.remark
-            this.dealerDialog.isCreated = 3
-            this.dealerDialog.isVisibility = true
+            this.dealerData[this.editIndex].dealer_name =
+              response.data.data.dealer.dealer_name;
+            this.dealerData[this.editIndex].contact =
+              response.data.data.dealer.contact;
+            this.dealerData[this.editIndex].contact_phone =
+              response.data.data.dealer.contact_phone;
+            this.dealerData[this.editIndex].platform_number =
+              response.data.data.dealer.platform_number;
+            this.dealerData[this.editIndex].email =
+              response.data.data.dealer.email;
+            this.dealerData[this.editIndex].contact_address =
+              response.data.data.dealer.contact_address;
+            this.dealerData[this.editIndex].remark =
+              response.data.data.dealer.remark;
+            this.dealerData[this.editIndex].dealer_code =
+              response.data.data.dealer.dealer_code;
+
+            this.$message.success("修改成功");
           }
         });
-      },
-      manufacturerDialogComfirm: function (val) {
-        this.$refs.dialog.hide()
-
-
-        if (val.isCreated == 2) { //修改
-          let params = {
-            'dealer_name': val.dealer_name,
-            'contact': val.contact,
-            'contact_phone': val.contact_phone,
-            'platform_number': val.platform_number,
-            'email': val.email,
-            'contact_address': val.contact_address,
-            'remark': val.remark,
-            'dealer_code': this.dealer_code,
-            'id': this.editId
-          }
-          modifyDealer(params).then(response => {
-            if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
-            } else {
-              this.dealerData[this.editIndex].dealer_name = response.data.data.dealer.dealer_name
-              this.dealerData[this.editIndex].contact = response.data.data.dealer.contact
-              this.dealerData[this.editIndex].contact_phone = response.data.data.dealer.contact_phone
-              this.dealerData[this.editIndex].platform_number = response.data.data.dealer.platform_number
-              this.dealerData[this.editIndex].email = response.data.data.dealer.email
-              this.dealerData[this.editIndex].contact_address = response.data.data.dealer.contact_address
-              this.dealerData[this.editIndex].remark = response.data.data.dealer.remark
-              this.dealerData[this.editIndex].dealer_code = response.data.data.dealer.dealer_code
-
-              this.$message.success("修改成功")
-
-
-            }
-          });
-
-        } else if (val.isCreated == 1) { //新增
-          createDealer(val).then(response => {
-            if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
-            } else {
-              this.dealerData.unshift(response.data.data.dealer)
-
-              this.$message.success("新增成功")
-
-
-            }
-          });
-
-        }
-
-
-      },
-      manufacturerDialogCancle: function () {
-        this.$refs.dialog.hide()
-
-      },
-      showDialog: function () {
-        // this.manufacturerDialog.formValue = {}
-        this.dealerDialog.formValue = Object.assign({}, this.dealerDialog.resetForm)
-        this.$refs.dialog.show()
-
-        this.dealerDialog.isCreated = 1
-
-      }, handleSizeChange(val) {
-        this.limit = val;
-        this.getList();
-      }, handleCurrentChange(val) {
-        this.page = val;
-        this.getList();
-      },getList(){
-        let params = {
-          'page':this.page,
-          'limit':this.limit
-        }
-        this.loading = true
-        getDealersList(params).then(response => {
+      } else if (val.isCreated == 1) {
+        //新增
+        createDealer(val).then(response => {
           if (response.data.state == 0) {
-            this.loading = false
-
             this.$message.error(response.data.msg);
             return false;
           } else {
-            this.loading = false
-            this.total = response.data.data.total
-            this.dealerData = []
-            for (let i = 0; i < response.data.data.dealer.length; i++) {
-              this.dealerData.push(response.data.data.dealer[i])
+            this.dealerData.unshift(response.data.data.dealer);
 
-            }
+            this.$message.success("新增成功");
           }
         });
-
       }
     },
-    created() {
-      this.getList()
-
+    manufacturerDialogCancle: function() {
+      this.$refs.dialog.hide();
+    },
+    showDialog: function() {
+      // this.manufacturerDialog.formValue = {}
+      this.dealerDialog.formValue = Object.assign(
+        {},
+        this.dealerDialog.resetForm
+      );
+      this.$refs.dialog.show();
+
+      this.dealerDialog.isCreated = 1;
+    },
+    handleSizeChange(val) {
+      this.limit = val;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getList();
+    },
+    getList() {
+      let params = {
+        page: this.page,
+        limit: this.limit
+      };
+      this.loading = true;
+      getDealersList(params).then(response => {
+        if (response.data.state == 0) {
+          this.loading = false;
+
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.loading = false;
+          this.total = response.data.data.total;
+          this.dealerData = [];
+          for (let i = 0; i < response.data.data.dealer.length; i++) {
+            this.dealerData.push(response.data.data.dealer[i]);
+          }
+        }
+      });
     }
-  };
+  },
+  created() {
+    this.getList();
+  }
+};
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>
-  .information {
-    border: 1px #dcdfe6 solid;
-    padding: 30px 20px 30px 20px;
+.information {
+  border: 1px #dcdfe6 solid;
+  padding: 30px 20px 30px 20px;
 
-    .border {
-      border-bottom: 1px #dcdfe6 solid;
-      margin: 0px 0 20px 0;
-    }
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
   }
-
-  .title {
-    height: 44px;
-    line-height: 44px;
-    padding: 0 0 0 10px;
-    margin: 0 0 10px 0;
-    // border-radius: 4px 4px 0 0;
-  }
-
-  .edit_separater {
-    border-top: 1px solid rgb(233, 233, 233);
-    margin-top: 15px;
-    margin-bottom: 15px;
-  }
-
+}
+
+.title {
+  height: 44px;
+  line-height: 44px;
+  padding: 0 0 0 10px;
+  margin: 0 0 10px 0;
+  // border-radius: 4px 4px 0 0;
+}
+
+.edit_separater {
+  border-top: 1px solid rgb(233, 233, 233);
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
 </style>
 
 <style>
-  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
-    font-size: 12px;
-  }
-
-  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
-    background: #6fb5fa;
-  }
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
 
-  .dataTitle {
-    color: #409eff;
-    font-size: 16px;
-    border-bottom: 1px #409eff solid;
-    height: 36px;
-    line-height: 10px;
-    margin: 0 0 10px 0;
-    position: relative;
-    padding: 0 0 6px 10px;
-  &::before {
-     position: absolute;
-     left: 0;
-     bottom: 10px;
-     content: "";
-     width: 2px;
-     height: 20px;
-     background: #409eff;
-   }
-  }
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
 
 </style>

src/xt_pages/stock/config/goodType.vue

@@ -140,91 +140,90 @@
 </template>
 
 <script>
-  import goodTypeDialog from '../Dialog/goodTypeDialog'
-  import {
-    createGoodType,
-    modifyGoodType,
-    getGoodTypeList,
-    deleteGoodType,
-    GetGoodType,
-
-    createGoodInfo,
-    modifyGoodInfo,
-    getGoodInfoList,
-    deleteGoodInfo,
-    GetGoodInfoByGoodId,
-    GetGoodInfo,
-    GetAllDeals,
-    GetAllManufacturer,
-    GetAllGoodType
-  } from "@/api/stock";
-  import GoodInfoDailog from "../Dialog/goodInfoDailog";
-
-  export default {
-    components: {
-      goodTypeDialog
-    },
-    name: "goodType",
-    data() {
-      return {
-        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
-        total: 0,
-        pageTotal: 0,
-        pageSelect: 0,
-        page: 1,
-        limit: 7,
-
-        goodType: {
-          loading: false,
-          goodTypeData: [],
-          type_code: '',
-          editInfoId: '',
-          editInfoIndex: '',
-          tableCurrentIndex: -1,
-          goodTypeDialog: {
-            goodTypeTitle: '新增商品类型',
-            isCreated: 1, //1.创建 2.编辑 3.查看详情
-            formValue: {
-              type_name: '',
-              remark: '',
-            },
-            isVisibility: false,
+import goodTypeDialog from "../Dialog/goodTypeDialog";
+import {
+  createGoodType,
+  modifyGoodType,
+  getGoodTypeList,
+  deleteGoodType,
+  GetGoodType,
+  createGoodInfo,
+  modifyGoodInfo,
+  getGoodInfoList,
+  deleteGoodInfo,
+  GetGoodInfoByGoodId,
+  GetGoodInfo,
+  GetAllDeals,
+  GetAllManufacturer,
+  GetAllGoodType
+} from "@/api/stock";
+import GoodInfoDailog from "../Dialog/goodInfoDailog";
+
+export default {
+  components: {
+    goodTypeDialog
+  },
+  name: "goodType",
+  data() {
+    return {
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      total: 0,
+      pageTotal: 0,
+      pageSelect: 0,
+      page: 1,
+      limit: 7,
+
+      goodType: {
+        loading: false,
+        goodTypeData: [],
+        type_code: "",
+        editInfoId: "",
+        editInfoIndex: "",
+        tableCurrentIndex: -1,
+        goodTypeDialog: {
+          goodTypeTitle: "新增商品类型",
+          isCreated: 1, //1.创建 2.编辑 3.查看详情
+          formValue: {
+            type_name: "",
+            remark: ""
           },
+          isVisibility: false
         }
+      }
+    };
+  },
+  methods: {
+    handleEdit: function(index, row) {
+      this.goodType.editTypeId = row.id;
+      this.goodType.editTypeIndex = index;
+      let params = {
+        id: row.id
       };
-    },
-    methods: {
-      handleEdit: function (index, row) {
-        this.goodType.editTypeId = row.id
-        this.goodType.editTypeIndex = index
-        let params = {
-          id: row.id
+      GetGoodType(params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.goodType.goodTypeDialog.formValue.remark =
+            response.data.data.goodType.remark;
+          this.goodType.goodTypeDialog.formValue.type_name =
+            response.data.data.goodType.type_name;
+          this.goodType.goodTypeDialog.isCreated = 2;
+          this.$refs.dialog.show();
+          this.goodType.type_code = response.data.data.goodType.type_code;
         }
-        GetGoodType(params).then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            return false;
-          } else {
-            this.goodType.goodTypeDialog.formValue.remark = response.data.data.goodType.remark
-            this.goodType.goodTypeDialog.formValue.type_name = response.data.data.goodType.type_name
-            this.goodType.goodTypeDialog.isCreated = 2
-            this.$refs.dialog.show()
-            this.goodType.type_code = response.data.data.goodType.type_code
-
-          }
-        });
-
-      },
-      handleDelete: function (index, row) {
-
-        this.$confirm('确认删除这条商品类型?', '删除商品类型', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
+      });
+    },
+    handleDelete: function(index, row) {
+      this.$confirm("确认删除这条商品类型?", "删除商品类型", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
           let params = {
             id: row.id
-          }
+          };
 
           deleteGoodType(params).then(response => {
             if (response.data.state == 0) {
@@ -232,197 +231,163 @@
               return false;
             } else {
               this.goodType.goodTypeData.splice(index, 1);
-              this.goodType.tableCurrentIndex = -1
+              this.goodType.tableCurrentIndex = -1;
 
-              this.$message.success("删除成功")
+              this.$message.success("删除成功");
             }
           });
-        }).catch(() => {
-        });
+        })
+        .catch(() => {});
+    },
+    showDetails: function(index, row) {
+      let params = {
+        id: row.id
+      };
+      GetGoodType(params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.goodType.goodTypeDialog.formValue.type_name =
+            response.data.data.goodType.type_name;
+          this.goodType.goodTypeDialog.formValue.remark =
+            response.data.data.goodType.remark;
+          this.goodType.goodTypeDialog.isCreated = 3;
+          this.goodType.goodTypeDialog.isVisibility = true;
+        }
+      });
+    },
 
+    goodTypeDialogComfirm: function(val) {
+      this.$refs.dialog.hide();
 
-      },
-      showDetails: function (index, row) {
+      if (val.isCreated == 2) {
+        //修改
         let params = {
-          id: row.id
-        }
-        GetGoodType(params).then(response => {
+          type_name: val.type_name,
+          remark: val.remark,
+          type_code: this.goodType.type_code,
+          id: this.goodType.editTypeId
+        };
+
+        modifyGoodType(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg);
             return false;
           } else {
-            this.goodType.goodTypeDialog.formValue.type_name = response.data.data.goodType.type_name
-            this.goodType.goodTypeDialog.formValue.remark = response.data.data.goodType.remark
-            this.goodType.goodTypeDialog.isCreated = 3
-            this.goodType.goodTypeDialog.isVisibility = true
-          }
-        });
-      },
+            this.goodType.goodTypeData[this.goodType.editTypeIndex].type_name =
+              response.data.data.goodTypes.type_name;
+            this.goodType.goodTypeData[this.goodType.editTypeIndex].remark =
+              response.data.data.goodTypes.remark;
 
-
-      goodTypeDialogComfirm: function (val) {
-        this.$refs.dialog.hide()
-
-        if (val.isCreated == 2) { //修改
-          let params = {
-            'type_name': val.type_name,
-            'remark': val.remark,
-            'type_code': this.goodType.type_code,
-            'id': this.goodType.editTypeId
+            this.$message.success("修改成功");
           }
-
-
-          modifyGoodType(params).then(response => {
-            if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
-            } else {
-              this.goodType.goodTypeData[this.goodType.editTypeIndex].type_name = response.data.data.goodTypes.type_name
-              this.goodType.goodTypeData[this.goodType.editTypeIndex].remark = response.data.data.goodTypes.remark
-
-              this.$message.success("修改成功")
-
-
-            }
-          });
-
-        } else if (val.isCreated == 1) { //新增
-          createGoodType(val).then(response => {
-            if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
-            } else {
-              this.goodType.goodTypeData.unshift(response.data.data.goodTypes)
-
-              this.$message.success("新增成功")
-
-
-            }
-          });
-
-        }
-
-      },
-      goodTypeDialogCancle: function () {
-        this.$refs.dialog.hide()
-
-
-
-      }, showDialog: function () {
-        this.$refs.dialog.show()
-
-
-      }, getList() {
-        this.goodType.loading = true
-
-        let params = {
-          'page': this.page,
-          'limit': this.limit
-        }
-        getGoodTypeList(params).then(response => {
+        });
+      } else if (val.isCreated == 1) {
+        //新增
+        createGoodType(val).then(response => {
           if (response.data.state == 0) {
-            this.goodType.loading = false
             this.$message.error(response.data.msg);
             return false;
           } else {
-            this.goodType.loading = false
-            this.total = response.data.data.total
-            this.goodType.goodTypeData = []
-            for (let i = 0; i < response.data.data.list.length; i++) {
-              this.goodType.goodTypeData.push(response.data.data.list[i])
+            this.goodType.goodTypeData.unshift(response.data.data.goodTypes);
 
-            }
+            this.$message.success("新增成功");
           }
         });
+      }
+    },
+    goodTypeDialogCancle: function() {
+      this.$refs.dialog.hide();
+    },
+    showDialog: function() {
+      this.$refs.dialog.show();
+    },
+    getList() {
+      this.goodType.loading = true;
 
-      }, tableRowClassName({row, rowIndex}) {
-        //把每一行的索引放进row
-        row.index = rowIndex;
-      },
-      onRowClick(row, event, column) {
-        this.goodType.tableCurrentIndex = row.index;
-
-      },
-      showInfoDialog: function () {
-
-
-        if (this.goodType.tableCurrentIndex == -1) {
-          this.$message.error("请先选择商品类型");
-          return
+      let params = {
+        page: this.page,
+        limit: this.limit
+      };
+      getGoodTypeList(params).then(response => {
+        if (response.data.state == 0) {
+          this.goodType.loading = false;
+          this.$message.error(response.data.msg);
+          return false;
         } else {
-          this.getAllGoodType()
+          this.goodType.loading = false;
+          this.total = response.data.data.total;
+          this.goodType.goodTypeData = [];
+          for (let i = 0; i < response.data.data.list.length; i++) {
+            this.goodType.goodTypeData.push(response.data.data.list[i]);
+          }
         }
-
-      }, handleSizeChange(val) {
-        this.limit = val;
-        this.getList();
-      }, handleCurrentChange(val) {
-        this.page = val;
-        this.getList();
+      });
+    },
+    tableRowClassName({ row, rowIndex }) {
+      //把每一行的索引放进row
+      row.index = rowIndex;
+    },
+    onRowClick(row, event, column) {
+      this.goodType.tableCurrentIndex = row.index;
+    },
+    showInfoDialog: function() {
+      if (this.goodType.tableCurrentIndex == -1) {
+        this.$message.error("请先选择商品类型");
+        return;
+      } else {
+        this.getAllGoodType();
       }
     },
-    created() {
-      this.getList()
+    handleSizeChange(val) {
+      this.limit = val;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getList();
     }
-  };
+  },
+  created() {
+    this.getList();
+  }
+};
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>
-  .information {
-    border: 1px #dcdfe6 solid;
-    padding: 30px 20px 30px 20px;
+.information {
+  border: 1px #dcdfe6 solid;
+  padding: 30px 20px 30px 20px;
 
-    .border {
-      border-bottom: 1px #dcdfe6 solid;
-      margin: 0px 0 20px 0;
-    }
-  }
-
-  .title {
-    height: 44px;
-    line-height: 44px;
-    padding: 0 0 0 10px;
-    margin: 0 0 10px 0;
-    // border-radius: 4px 4px 0 0;
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
   }
-
-  .edit_separater {
-    border-top: 1px solid rgb(233, 233, 233);
-    margin-top: 15px;
-    margin-bottom: 15px;
-  }
-
+}
+
+.title {
+  height: 44px;
+  line-height: 44px;
+  padding: 0 0 0 10px;
+  margin: 0 0 10px 0;
+  // border-radius: 4px 4px 0 0;
+}
+
+.edit_separater {
+  border-top: 1px solid rgb(233, 233, 233);
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
 </style>
 
 <style>
-  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
-    font-size: 12px;
-  }
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
 
-  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
-    background: #6fb5fa;
-  }
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
 
-  .dataTitle {
-    color: #409eff;
-    font-size: 16px;
-    border-bottom: 1px #409eff solid;
-    height: 36px;
-    line-height: 30px;
-    margin: 0 0 15px 0;
-    position: relative;
-    padding: 0 0 6px 15px;
-
-  &
-  ::before {
-    position: absolute;
-    left: 0;
-    bottom: 10px;
-    content: "";
-    width: 2px;
-    height: 20px;
-    background: #409eff;
-  }
-
-  }
 </style>

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/components/EditGroupAdvice.vue

@@ -40,49 +40,41 @@
           </el-col>
         </el-row>
         <el-row style="margin-bottom: 20px">
+          <el-col :span="2">&nbsp;</el-col>
           <el-col :span="5">
             <el-button
               :disabled="$store.getters.xt_user.subscibe.state==3?true:false"
-              type="primary"
               @click="openAdviceTemplate()"
+              round
             >选择医嘱模板
             </el-button>
           </el-col>
-          <el-col :span="1">&nbsp;</el-col>
+          
           <el-col :span="5">
             <el-button
               :disabled="$store.getters.xt_user.subscibe.state==3?true:false"
-              type="primary"
+              round
               @click="openGroupAdvice(0)"
             >新增医嘱内容
             </el-button>
           </el-col>
-          <el-col :span="1">&nbsp;</el-col>
+          
           <el-col :span="5">
             <el-button
               :disabled="$store.getters.xt_user.subscibe.state==3?true:false"
-              type="primary"
+              round              
               @click="openDeleteGroupAdvice()"
             >删除医嘱内容
             </el-button>
           </el-col>
-          <el-col :span="1">&nbsp;</el-col>
           <el-col :span="5">
             <el-button
               :disabled="$store.getters.xt_user.subscibe.state==3?true:false"
-              type="primary"
+              round              
               @click="openGroupAdvice(1)"
             >修改医嘱内容
             </el-button>
           </el-col>
-          <!-- <el-col :span="1">&nbsp;</el-col>
-          <el-col :span="4">
-            <el-button
-              :disabled="$store.getters.xt_user.subscibe.state==3?true:false"
-              type="primary"
-              @click="openGroupChild()"
-            >添加子药内容</el-button>
-          </el-col> -->
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -374,7 +366,7 @@
                 allow-create
                 :disabled="isChild"
                 placeholder="请选择(输入可搜索)"
-                style="width:90%"
+                style="width:100%"
               >
                 <el-option
                   v-for="item in deliveryWayOptions"
@@ -394,7 +386,7 @@
                 allow-create
                 :disabled="isChild"
                 placeholder="请选择(输入可搜索)"
-                style="width:90%"
+                style="width:100%"
               >
                 <el-option
                   v-for="item in executionFrequencyOptions"

src/xt_pages/user/components/PatientDetail.vue

@@ -1081,25 +1081,6 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-// .dataTitle {
-//   color: #409eff;
-//   font-size: 16px;
-//   border-bottom: 1px #409eff solid;
-//   height: 36px;
-//   line-height: 30px;
-//   margin: 0 0 15px 0;
-//   // position: relative;
-//   padding: 0 0 6px 15px;
-//   &::before {
-//     position: absolute;
-//     left: 0;
-//     bottom: 10px;
-//     content: "";
-//     width: 2px;
-//     height: 20px;
-//     background: #409eff;
-//   }
-// }
 .uploadHead {
   margin-top: 25%;
 }
@@ -1111,6 +1092,7 @@ export default {
   .el-col-6,
   .el-col-8 {
     width: 360px;
+    height:59px!important;
   }
   .el-form-item {
     // margin-bottom: 17px !important;

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>

src/xt_pages/user/dialysisSolution.vue

@@ -132,7 +132,7 @@
     width="1010px">
     <el-form ref="addPlan" :model="addPlan" :rules="addPlanRules" label-width="160px">
       <el-row :gutter="20">
-        <el-col  :span="8" style="height:59px;" >
+        <el-col  :span="8"  >
             <el-form-item label="透析模式:" prop="mode" >
               <el-select v-model="addPlan.mode" @change="addPlanModeChange" :disabled="isEdit?true:false" >
                 <el-option v-for="item in modeOptions"  :label="item.name" :key="item.id" :value="item.id"></el-option>

src/xt_pages/user/doctorAdvice.vue

@@ -213,9 +213,8 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-
-                            <el-form-item label="开始时间 :" required prop="start_time">
-                                <el-date-picker type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"  placeholder="选择时间" v-model="groupForm.start_time" ></el-date-picker>
+                            <el-form-item label="开始时间 :" required prop="start_time" style="width:100%;">
+                                <el-date-picker style="width:100%;" type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"  placeholder="选择时间" v-model="groupForm.start_time" ></el-date-picker>
                             </el-form-item>
                         </el-col>
                     </el-row>
@@ -236,33 +235,22 @@
                         </el-col>
                     </el-row>
                     <el-row>
-                        <el-col :span="5">
-                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="openAdviceTemplate()">选择医嘱模板</el-button>
-                        </el-col>
-                        <el-col :span="1">
-                          &nbsp;
+                        <el-col :span="2">
+                           &nbsp;
                         </el-col>
                         <el-col :span="5">
-                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="openGroupAdvice(0)">新增医嘱内容</el-button>
-                        </el-col>
-                        <el-col :span="1">
-                          &nbsp;
+                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round  @click="openAdviceTemplate()">选择医嘱模板</el-button>
                         </el-col>
                         <el-col :span="5">
-                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="openDeleteGroupAdvice()">删除医嘱内容</el-button>
-                        </el-col>
-                        <el-col :span="1">
-                          &nbsp;
+                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round  @click="openGroupAdvice(0)">新增医嘱内容</el-button>
                         </el-col>
                         <el-col :span="5">
-                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="openGroupAdvice(1)">修改医嘱内容</el-button>
+                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round @click="openDeleteGroupAdvice()">删除医嘱内容</el-button>
                         </el-col>
-                        <!-- <el-col :span="1">
-                          &nbsp;
+                        <el-col :span="5">
+                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round  @click="openGroupAdvice(1)">修改医嘱内容</el-button>
                         </el-col>
-                        <el-col :span="4">
-                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="openGroupChild()">添加子药内容</el-button>
-                        </el-col> -->
+                        
                     </el-row>
                     <el-row>
                       <el-col :span="24">
@@ -482,7 +470,7 @@
                     <el-row>
                         <el-col :span="12">
                             <el-form-item label="给药途径 :" prop="delivery_way">
-                                <el-select v-model="nameForm.delivery_way"  filterable clearable allow-create  :disabled='isChild' placeholder="请选择(输入可搜索)" style="width:90%" >
+                                <el-select v-model="nameForm.delivery_way"  filterable clearable allow-create  :disabled='isChild' placeholder="请选择(输入可搜索)" style="width:100%" >
                                     <el-option
                                     v-for="item in deliveryWayOptions"
                                     :key="item.id"
@@ -494,7 +482,7 @@
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="执行频率 :" prop="execution_frequency">
-                                 <el-select v-model="nameForm.execution_frequency"  filterable clearable allow-create :disabled='isChild' placeholder="请选择(输入可搜索)" style="width:90%" >
+                                 <el-select v-model="nameForm.execution_frequency"  filterable clearable allow-create :disabled='isChild' placeholder="请选择(输入可搜索)" style="width:100%" >
                                     <el-option
                                     v-for="item in executionFrequencyOptions"
                                     :key="item.id"

src/xt_pages/user/registration.vue

@@ -580,25 +580,6 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.dataTitle {
-  color: #409eff;
-  font-size: 16px;
-  border-bottom: 1px #409eff solid;
-  height: 36px;
-  line-height: 30px;
-  margin: 0 0 15px 0;
-  position: relative;
-  padding: 0 0 6px 15px;
-  &::before {
-    position: absolute;
-    left: 0;
-    bottom: 10px;
-    content: "";
-    width: 2px;
-    height: 20px;
-    background: #409eff;
-  }
-}
 .uploadHead {
   margin-top: 25%;
 }
@@ -622,5 +603,11 @@ export default {
     border-radius: 4px;
   }
 }
+.el-form{
+    .el-col-6,.el-col-8{
+    height: 59px!important;
+}
+}
+
 </style>
 

src/xt_pages/workforce/components/setup_template_dialog.vue

@@ -1,6 +1,6 @@
 <template>
  <!-- top="5vh" -->
-    <el-dialog title="设置模板" width="50%" :visible.sync="visible" :before-close="_close">
+    <el-dialog title="设置模板" width="400px" :visible.sync="visible" :before-close="_close">
         <el-form :model="form" label-width="100px">
             <el-form-item label="模板启用数量">
                 <el-select v-model="form.mode" placeholder="">
@@ -10,7 +10,7 @@
                 </el-select>
             </el-form-item>
         </el-form>
-        <div style="text-align: right; padding-right: 25px; padding-top: 10px; padding-bottom: 10px;">
+        <div slot="footer" class="dialog-footer">
             <el-button @click="hide">取 消</el-button>
             <el-button :disabled="$store.getters.xt_user.subscibe.state == 3 ? true : false" type="primary" @click="saveAction">保 存</el-button>
         </div>
@@ -49,7 +49,7 @@ export default {
             done()
         },
         clear: function() {
-            
+         
         },
         show() {
             this.clear()

src/xt_pages/workforce/components/template_schedule_selector_dialog.vue

@@ -13,11 +13,11 @@
                     </el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item>
-                <el-button type="danger" @click="cancelScheduleAction">取消排班</el-button>
-                <el-button type="primary" @click="saveAction">保存</el-button>
-            </el-form-item>
         </el-form>
+        <div slot="footer" class="dialog-footer">
+            <el-button  @click="cancelScheduleAction">取消排班</el-button>
+            <el-button type="primary" @click="saveAction">保 存</el-button>
+        </div>
     </el-dialog>
 </template>
 

src/xt_pages/workforce/components/template_table.vue

@@ -6,8 +6,8 @@
                     <el-button type="primary" size="small" @click="is_editing = true" icon="el-icon-edit-outline">编辑</el-button>
                 </div>
                 <div v-show="editable && is_editing">
-                    <el-button type="info" size="small" @click="is_editing = false" icon="el-icon-delete">取消</el-button>
-                    <el-button type="primary" size="small" icon="el-icon-document" @click="saveAction">保存</el-button>
+                    <el-button  size="small" @click="is_editing = false" icon="el-icon-refresh">取消</el-button>
+                    <el-button type="primary" size="small" icon="el-icon-setting" @click="saveAction">保存</el-button>
                 </div>
             </el-col>
         </el-row>