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

src/styles/index.scss

 .el-dialog__body {
   max-height: calc(100vh - 290px) !important;
   overflow-y: scroll !important;
-  margin-right: 8px;
+  // margin-right: 8px;
   /* 针对缺省样式 (必须的) */
   &::-webkit-scrollbar {
     width: 6px;

src/xt_pages/data/components/addDrugs.vue

             <el-form-item label="代理商 : " prop="agent">
               <el-input v-model="form.agent" style="width:160px;" placeholder="" maxlength="30"></el-input>
             </el-form-item>
-            <el-form-item label=""  style="visibility: hidden;">
+            <el-form-item label=""  style="display:none;">
               <el-input style="width:160px;" placeholder="" maxlength="30"></el-input>
             </el-form-item>
             <el-form-item label="状态 : " prop="drug_status">

src/xt_pages/data/components/consumables.vue

       </el-table-column>
       <el-table-column label="状态" width="60" align="center">
         <template slot-scope="scope">
-        {{ scope.row.good_status}}
+        <!--{{ scope.row.good_status}}-->
+          <div>{{scope.row.good_status.indexOf('停用') == -1 ? '启用':'停用' }}</div>
+
         </template>
 
       </el-table-column>

src/xt_pages/data/components/drugs.vue

         </template>
 
       </el-table-column>
-      <el-table-column label="单价" width="60" align="center">
+      <el-table-column label="零售价" width="60" align="center">
         <template slot-scope="scope">
-          <!--<div>{{scope.row.drug_spec}}</div>-->
+          <div>{{scope.row.retail_price}}</div>
         </template>
       </el-table-column>
       <el-table-column label="状态" width="60" align="center">
   import selfPayment from './selfPayment'
   import maintain from './maintain'
   import addDrugs from './addDrugs'
-  import {
-    GetAllManufacturer,
-  } from '@/api/stock'
+  import { GetAllManufacturer } from '@/api/stock'
 
   import {
     createBaseDrugLib,
-    getBaseDrugLib,
-    getBaseDrugLibList,
-    createMedicineInsurancePercent,
     createDrugUnitSafeguard,
-    editBaseDrugLib
+    createMedicineInsurancePercent,
+    editBaseDrugLib,
+    getBaseDrugLib,
+    getBaseDrugLibList
   } from '@/api/data'
 
-
   export default {
     components: {
       selfPayment,
     },
     data() {
       return {
-        page:0,
-        limit:10,
-        keywords:"",
-        is_use:'',
-        is_charge:'',
-        is_inject:'',
-        list:[],
-
-        isCreated:1,
-        manufacturers:[],
+        page: 0,
+        limit: 10,
+        keywords: '',
+        is_use: '',
+        is_charge: '',
+        is_inject: '',
+        list: [],
+
+        isCreated: 1,
+        manufacturers: [],
         title: '',
         formValue: {
           drug_name: '',//药品名称
           number: '',//批准文号
           drug_classify: '',//药物分类
           drug_dose: '',//药品剂量
-          drug_dose_unit:'',
+          drug_dose_unit: '',
           medical_insurance_number: '',//医保编号
-          manufacturer:'', //生产产商
+          manufacturer: '', //生产产商
           pharmacology_category: '',//药理分类
           statistics_category: '',//统计分类
           code: '',//本位码
           is_charge_predict: '',//是否收费预估项
           is_statistics_work: '',//是否统计工作量
           is_charge_use: '',//是否收费常用项
-          drug_code:"",
+          drug_code: ''
 
         },
         tempFormValue: {
           number: '',//批准文号
           drug_classify: '',//药物分类
           drug_dose: '',//药品剂量
-          drug_dose_unit:'',
+          drug_dose_unit: '',
           medical_insurance_number: '',//医保编号
-          manufacturer:'', //生产产商
+          manufacturer: '', //生产产商
           pharmacology_category: '',//药理分类
           statistics_category: '',//统计分类
           code: '',//本位码
           is_charge_predict: '',//是否收费预估项
           is_statistics_work: '',//是否统计工作量
           is_charge_use: '',//是否收费常用项
-          drug_code:"",
+          drug_code: ''
 
         },
 
-        current_id:0,
+        current_id: 0,
 
         search_input: '',
         options: [
           {
             value: '0',
             label: '全部'
-          },{
-          value: '1',
-          label: '是'
-        }, {
-          value: '2',
-          label: '否'
-        }],
+          }, {
+            value: '1',
+            label: '是'
+          }, {
+            value: '2',
+            label: '否'
+          }],
         value: '',
         tableData: [{
           date: '2016-05-02',
         this.page = val
         this.getList()
       },
-      changeInject(val){
+      changeInject(val) {
         this.getList()
 
       },
-      changeCharge(val){
+      changeCharge(val) {
         this.getList()
 
       },
-      changeUser(val){
+      changeUser(val) {
         this.getList()
 
-
       },
-      getName(id){
-
-      for (let i =0; i < this.manufacturers.length;i++){
-        if(this.manufacturers[i].id == id){
-          return this.manufacturers[i].manufacturer_name
+      getName(id) {
+        for (let i = 0; i < this.manufacturers.length; i++) {
+          if (this.manufacturers[i].id == id) {
+            return this.manufacturers[i].manufacturer_name
+          }
         }
-        return ""
-      }
-
+        return ''
       },
       goodInfoDialogComfirm: function(val) {
 
         this.getList()
       },
       clickSelfPayment(drug_id) {
-        this.$refs.selfPayment.show(drug_id,1)
+        this.$refs.selfPayment.show(drug_id, 1)
       },
       clickMainTain() {
         // this.$refs.maintain.show();
       },
       openForm(id) {
         this.getAllManufacturer()
-        if (id > 0){
+        if (id > 0) {
           this.current_id = id
           let params = {
             id: this.current_id
               this.$message.error(response.data.msg)
               return false
             } else {
-              for(let key in response.data.data.drug){
+              for (let key in response.data.data.drug) {
                 this.formValue[key] = response.data.data.drug[key]
               }
-              this.formValue.is_special_diseases = this.formValue.is_special_diseases.toString()
-              this.formValue.is_record = this.formValue.is_record.toString()
-              this.formValue.is_use_doctor_advice = this.formValue.is_use_doctor_advice.toString()
-              this.formValue.is_default = this.formValue.is_default.toString()
-              this.formValue.is_charge_predict = this.formValue.is_charge_predict.toString()
-              this.formValue.is_statistics_work = this.formValue.is_statistics_work.toString()
-              this.formValue.is_charge_use = this.formValue.is_charge_use.toString()
-              this.$refs.addDrugs.show(id,this.formValue)
+
+              if(this.formValue.is_special_diseases <= 0){
+
+                this.formValue.is_special_diseases = ''
+              } else{
+
+                this.formValue.is_special_diseases = this.formValue.is_special_diseases.toString()
+
+
+              }
+
+              if(this.formValue.is_record <= 0){
+
+                this.formValue.is_record = ''
+              } else{
+
+                this.formValue.is_record = this.formValue.is_record.toString()
+
+
+              }
+
+
+              if(this.formValue.is_use_doctor_advice <= 0){
+
+                this.formValue.is_use_doctor_advice = ''
+              } else{
+
+                this.formValue.is_use_doctor_advice = this.formValue.is_use_doctor_advice.toString()
+
+
+              }
+
+
+              if(this.formValue.is_default <= 0){
+
+                this.formValue.is_default = ''
+              } else{
+
+                this.formValue.is_default = this.formValue.is_default.toString()
+
+
+              }
+
+              if(this.formValue.is_charge_predict <= 0){
+
+                this.formValue.is_charge_predict = ''
+              } else{
+
+                this.formValue.is_charge_predict = this.formValue.is_charge_predict.toString()
+
+
+              }
+
+              if(this.formValue.is_statistics_work <= 0){
+
+                this.formValue.is_statistics_work = ''
+              } else{
+
+                this.formValue.is_statistics_work = this.formValue.is_statistics_work.toString()
+
+
+              }
+
+              if(this.formValue.is_charge_use <= 0){
+
+                this.formValue.is_charge_use = ''
+              } else{
+
+                this.formValue.is_charge_use = this.formValue.is_charge_use.toString()
+
+
+              }
+
+              this.$refs.addDrugs.show(id, this.formValue)
 
             }
           })
-        }else{
-          for(let key in this.tempFormValue){
+        } else {
+          for (let key in this.tempFormValue) {
             this.formValue[key] = this.tempFormValue[key]
           }
-          this.$refs.addDrugs.show(0,this.formValue)
+          this.$refs.addDrugs.show(0, this.formValue)
         }
-      },  getList() {
+      }, getList() {
         let params = {
           page: this.page,
           limit: this.limit,
           keyword: this.keywords,
-          is_use:this.is_use,
-          is_charge:this.is_charge,
-          is_inject:this.is_inject
+          is_use: this.is_use,
+          is_charge: this.is_charge,
+          is_inject: this.is_inject
         }
         getBaseDrugLibList(params).then(response => {
           if (response.data.state == 0) {
             }
           }
         })
-      },
+      }
 
-    },created() {
+    }, created() {
       this.getList()
       this.getAllManufacturer()
     }

src/xt_pages/stock/drugs/drugStockUserDetail.vue

               <span >{{scope.row.count}}</span>
             </template>
           </el-table-column>
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>出库方式</span>
+            </template>
+            <template slot-scope="scope">
+              <span v-if="scope.row.is_total == 0">{{"自动出库"}}</span>
+            </template>
+          </el-table-column>
           <el-table-column min-width="35" align="center">
             <template slot="header" slot-scope="scope">
               <span>使用时间</span>

src/xt_pages/stock/drugs/query.vue

   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <el-button
+          size="small"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-search"
+          @click="setting"
+        >设置</el-button
+        >
     </div>
     <div class="app-container ">
       <div class="cell clearfix">
         >
       </div>
 
-      <div class="cell clearfix">
-        <el-button
-          size="small"
-          class="filter-item"
-          type="primary"
-          icon="el-icon-search"
-          @click="setting"
-        >设置</el-button
-        >
-      </div>
 
       <el-table
         :row-style="{ color: '#303133' }"

src/xt_pages/stock/index.vue

     <div class="app-container" >
       <div class="service-box">
         <el-tabs v-model="activeName">
-          <el-tab-pane label="厂家" name="first">
-            <manufacturer></manufacturer>
-          </el-tab-pane>
-          <el-tab-pane label="经销商">
-            <dealer></dealer>
-          </el-tab-pane>
+          <!--<el-tab-pane label="厂家" name="first">-->
+            <!--<manufacturer></manufacturer>-->
+          <!--</el-tab-pane>-->
+          <!--<el-tab-pane label="经销商">-->
+            <!--<dealer></dealer>-->
+          <!--</el-tab-pane>-->
           <el-tab-pane label="商品类型">
             <good-type></good-type>
           </el-tab-pane>
-          <el-tab-pane label="商品信息">
-            <good-info></good-info>
-          </el-tab-pane>
+          <!--<el-tab-pane label="商品信息">-->
+            <!--<good-info></good-info>-->
+          <!--</el-tab-pane>-->
           <el-tab-pane label="自动扣减">
             <automatic-reduce></automatic-reduce>
           </el-tab-pane>

src/xt_pages/stock/selfPreparedMedicine/index.vue

                 v-model="start_time"
                 prefix-icon="el-icon-date"
                 :editable="false"
-                style="width: 196px;margin-right:10px;"
+                style="width: 160px;margin-right:10px;"
                 type="date"
                 placeholder="选择日期时间"
                 align="right"
                     <div style="display:flex;justify-content: space-between;align-items: center;">
                         <div class="tablesTitle">自备药列表</div>
                         <div>
-                            <el-button type="primary" @click="openForm(1)">添加</el-button>
-                            <el-button type="primary" @click="openForm(2)">入库</el-button>
-                            <el-button type="primary" @click="openForm(3)">出库</el-button>
+                            <el-button type="primary" size="mini" @click="openForm(1)">添加</el-button>
+                            <el-button type="primary" size="mini" @click="openForm(2)">入库</el-button>
+                            <el-button type="primary" size="mini" @click="openForm(3)">出库</el-button>
                         </div>
                     </div>
                     <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>

src/xt_pages/workforce/appointment.vue

           <span slot="label"><i class="el-icon-date"></i> 下一周 ({{theWeek.nextWeek}})</span>
         </el-tab-pane>
         <el-tab-pane name="nextTwoWeek">
-          <span slot="label"><i class="el-icon-date"></i> 下两周 ({{theWeek.nextTwoWeek}})</span>
+          <span slot="label"><i class="el-icon-date"></i> 下下周 ({{theWeek.nextTwoWeek}})</span>
         </el-tab-pane>
       </el-tabs>
       <!-- </el-col>

src/xt_pages/workforce/components/setup_template_dialog.vue

  <!-- top="5vh" -->
     <el-dialog title="设置模板" width="400px" :visible.sync="visible" :before-close="_close">
         <el-form :model="form" label-width="100px">
-            <el-form-item label="模板启用数量">
+            <el-form-item label="选择排班模板">
                 <el-select v-model="form.mode" placeholder="">
                     <el-option label="不启用模板" :value="0"></el-option>
-                    <el-option label="启用一个模板" :value="1"></el-option>
-                    <el-option label="启用两个模板" :value="2"></el-option>
+                    <el-option label="启用单周模板" :value="1"></el-option>
+                    <el-option label="启用双周模板" :value="2"></el-option>
                 </el-select>
             </el-form-item>
         </el-form>