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

src/xt_pages/data/components/addProject.vue

                                 </el-option>
                             </el-select>
                         </el-form-item>
+                        <el-form-item label="特检项目:" prop="">
+                           <el-select v-model="form.specail_project" style="width:160px;" placeholder="请选择">
+                              <el-option
+                                v-for="(item,index) in specailProject"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.id">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                         <el-form-item label="社保目录编码" >
+                            <el-input v-model="form.social_security_directory_code" style="width:180px"></el-input>
+                         </el-form-item>
+
+                        <el-form-item label="备案日期:" >
+                            <el-date-picker
+                                value-format="yyyy-MM-dd"
+                                v-model="form.record_date"
+                                type="date"
+                                placeholder="选择日期时间">
+                            </el-date-picker>
+                        </el-form-item>
                         <el-form-item label="备注 : " prop="remark" style="width:100%;">
                             <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
                         </el-form-item>
               delivery_way:"",
               execution_frequency:"",
               number_days:"",
-              total:""
+              total:"",
+              category:"",
+              specail_project:"",
+              social_security_directory_code:"",
+              record_date:""
             },
             rules: {
                 project_name: [{ required: true, message: '请填写项目名称', trigger: 'blur'  }],
              {id:1,name:"常规诊疗项目"},
              {id:4,name:"辅助器具项目"},
              {id:5,name:"加收项目"}
+           ],
+           specailProject:[
+             {id:1,name:"是"},
+             {id:2,name:"否"}
            ]
         }
     },
                     number_days:this.form.number_days,
                     total:this.form.total,
                     category:this.form.category,
+                    specail_project:this.form.specail_project,
+                    social_security_directory_code:this.form.social_security_directory_code,
+                    record_date:this.form.record_date
                }
-           
+             console.log("params222222",params)
               saveProject(params).then(response=>{
                  if(response.data.state == 1){
                    var hisProject = response.data.data.hisProject

src/xt_pages/data/components/consumables.vue

             console.log('ids222222222',ids)
             var idss = ids.join(',')
             let params = {
-              ids:idss
+              ids:idss,
+              admin_user_id:this.$store.getters.xt_user.user.id
             }
+            console.log("paramsw2",params)
         
             var that = this
             axios.get('http://127.0.0.1:9532/sz/api/goods/get',{ params: params }).then(function(response) {
          let params = {
              'id':id,
              'type_id':3,
-             'is_mark':isMark
+             'is_mark':isMark,
+             'admin_user_id':this.$store.getters.xt_user.user.id,
           }
          axios.get('http://127.0.0.1:9532/sz/api/revocation/get',{params:params}).then(function(response) {
           if (response.data.state == 0) {

src/xt_pages/data/components/drugTableSon.vue

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

src/xt_pages/data/components/drugs.vue

      getDataConfig(module, filed_name){
         return getDataConfig(module, filed_name)
       },
-      toRecord(){
-         var that = this
-         axios.get('http://127.0.0.1:9532/sz/api/drug/get').then(function(response) {
-          if (response.data.state == 0) {
-               that.$message.error(response.data.msg)
-               return false
-            } else {
-              that.$message({ message: '备案成功', type: 'success' })
-               that.getList()
-             }
-           }).catch(function(error) {
-        })
-      },
+      // toRecord(){
+      //    var that = this
+      //    axios.get('http://127.0.0.1:9532/sz/api/drug/get').then(function(response) {
+      //     if (response.data.state == 0) {
+      //          that.$message.error(response.data.msg)
+      //          return false
+      //       } else {
+      //         that.$message({ message: '备案成功', type: 'success' })
+      //          that.getList()
+      //        }
+      //      }).catch(function(error) {
+      //   })
+      // },
       toReturn(id,isMark){
         console.log("id2222",id)
          var that = this
              'id':id,
              'type_id':1,
              'is_mark':isMark,
+             'admin_user_id':this.$store.getters.xt_user.user.id
           }
          axios.get('http://127.0.0.1:9532/sz/api/revocation/get',{params:params}).then(function(response) {
           if (response.data.state == 0) {
         console.log('ids222222222',ids)
         var idss = ids.join(',')
         let params = {
-          ids:idss
+          ids:idss,
+          admin_user_id:this.$store.getters.xt_user.user.id
         }
-     
+        console.log("params2222")
         var that = this
         axios.get('http://127.0.0.1:9532/sz/api/drug/get',{ params: params }).then(function(response) {
          if (response.data.state == 0) {

src/xt_pages/data/components/editProject.vue

                                 :value="item.id">
                                 </el-option>
                             </el-select>
+                        </el-form-item>
+                         <el-form-item label="特检项目:" prop="">
+                           <el-select v-model="form.specail_project" style="width:160px;" placeholder="请选择">
+                              <el-option
+                                v-for="(item,index) in specailProject"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.id">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                         <el-form-item label="社保目录编码" >
+                            <el-input v-model="form.social_security_directory_code" style="width:180px"></el-input>
+                         </el-form-item>
+
+                        <el-form-item label="备案日期:" >
+                            <el-date-picker
+                                value-format="yyyy-MM-dd"
+                                v-model="form.record_date"
+                                type="date"
+                                placeholder="选择日期时间">
+                            </el-date-picker>
+                        </el-form-item>
+                        <el-form-item label="备注 : " prop="remark" style="width:100%;">
+                            <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
                         </el-form-item>
                         <el-form-item label="备注 : " prop="remark" style="width:100%;">
                             <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
 </template>
 
 <script>
+import { uParseTime } from '@/utils/tools'
 import { getDictionaryDataConfig,getDataConfig } from "@/utils/data";
 import { getProjectDetail,updatedProject } from "@/api/project/project"
 export default {
               execution_frequency:"",
               number_days:"",
               total:"",
-              category:""
+              category:"",
+              specail_project:"",
+              social_security_directory_code:"",
+              record_date:"",
             },
             rules: {
                 project_name: [{ required: true, message: '请填写项目名称', trigger: 'blur'  }],
              {id:1,name:"常规诊疗项目"},
              {id:4,name:"辅助器具项目"},
              {id:5,name:"加收项目"}
+           ],
+         specailProject:[
+             {id:1,name:"是"},
+             {id:2,name:"否"}
            ]
         }
     },
     methods:{
+        getTime(val) {
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
         _close: function(done) {
             done()
         },
               this.form.number_days = projecDetail.number_days
               this.form.total = projecDetail.total
               this.form.category = projecDetail.category
+              this.form.specail_project = projecDetail.specail_project
+              this.form.social_security_directory_code = projecDetail.social_security_directory_code
+              this.form.record_date = this.getTime(projecDetail.record_date)
             }
          })
        },
                     execution_frequency:this.form.execution_frequency,
                     number_days:this.form.number_days,
                     total:this.form.total,
-                    category:this.form.category
+                    category:this.form.category,
+                     specail_project:this.form.specail_project,
+                    social_security_directory_code:this.form.social_security_directory_code,
+                    record_date:this.form.record_date
                }
               
               updatedProject(params).then(response=>{

src/xt_pages/data/components/project.vue

              'id':id,
              'type_id':2,
              'is_mark':isMark,
+             'admin_user_id':this.$store.getters.xt_user.user.id,
           }
           console.log("params22222222",params)
          
         console.log('ids222222222',ids)
         var idss = ids.join(',')
         let params = {
-          ids:idss
+          ids:idss,
+          admin_user_id:this.$store.getters.xt_user.user.id
         }
-     
+       console.log("prams22",params)
         var that = this
         axios.get('http://127.0.0.1:9532/sz/api/treatment/get',{ params: params }).then(function(response) {
          if (response.data.state == 0) {

src/xt_pages/dialysis/batch_print/batch_print_order.vue

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

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

 .actionBar div{
     width:150px;
 }
-</style>
+</style>

src/xt_pages/role/admin.vue

     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
      
-       <div style="position: fixed;margin-left:950px">
+       <div>
         <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
           @click="openForm(0)">新增</el-button>
-     </div>
-      <!-- <el-button
-        type="primary"
-        size="small"
-        @click="toLogin"
-        >医药师登记</el-button> -->
         <el-button
         type="primary"
         size="small"
         @click="BatchDelete"
         >医药师登记</el-button>
+     </div>
+    
+      
     </div>
     <div class="app-container">
       <el-table
             </el-tooltip>
             <span v-if="scope.row.user_type == 2">
               <el-button type="primary" size="small" icon="el-icon-refresh-left" @click="toReturn(scope.row.user_id,scope.row.is_mark)">
-                    <span v-if="scope.row.is_mark ==0">已登记</span>
+                    <span v-if="scope.row.is_mark ==0">登记</span>
                     <span v-if="scope.row.is_mark ==1">撤销</span>
               </el-button>
             </span>
         console.log('ids222222222',ids)
         var idss = ids.join(',')
         let params = {
-          ids:idss
+          ids:idss,
+          admin_user_id:this.$store.getters.xt_user.user.id
         }
-     
+        console.log("prams222",params)
         var that = this
         axios.get('http://127.0.0.1:9532/sz/api/doctor/get',{ params: params }).then(function(response) {
          if (response.data.state == 0) {
          let params = {
            'id':id,
            "is_mark":is_mark,
+           "admin_user_id":this.$store.getters.xt_user.user.id
         }
+        console.log("params222222222",params)
          axios.get('http://127.0.0.1:9532/sz/api/medical/get',{params:params}).then(function(response) {
           if (response.data.state == 0) {
                that.$message.error(response.data.msg)
                return false
             } else {
-              that.$message({ message: '操作成功', type: 'success' })
+              // that.$message({ message: '操作成功', type: 'success' })
+              this.$message.error(response.data.msg)
               that.adminMainView()
              }
            }).catch(function(error) {

src/xt_pages/stock/Dialog/goodInfoDailog.vue

             <el-form-item label="生产地类别:">
               <el-select v-model="form.production_type" style="width:160px;" placeholder="请选择">
                 <el-option
-                  v-for="item in options"
+                  v-for="item in optionsOne"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value">

src/xt_pages/stock/detail/stockInDetail.vue

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

src/xt_pages/stock/detail/stockOutDetail.vue

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

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

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