1

src/api/role/admin.js

@@ -28,8 +28,6 @@ export function getAddAdminInitData() {
 
 export function addAdmin(params) {
   
-  console.log("epa",params)
-  
   return request({
     url: '/api/admin/add',
     method: 'get',
@@ -49,9 +47,6 @@ export function getModifyAdminInitData(uid) {
 }
 
 export function modifyAdmin(params) {
-  
-  
- 
  
   return request({
     url: '/api/admin/edit',
@@ -89,3 +84,4 @@ export function submitDialysisRecordPermissionUsers(ids_str) {
     params: params
   })
 }
+

src/xt_pages/data/components/addDrugs.vue

@@ -208,11 +208,39 @@
                 </el-option>
               </el-select>
             </el-form-item>
+
+            <el-form-item label="处方药标志" >
+                <el-select v-model="form.prescription_mark" style="width:160px;" placeholder="请选择">
+                <el-option
+                  v-for="item,index in options"
+                  :key="index"
+                  :label="item.label"
+                  :value="item.value">
+                </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="药品备注:">
+               <el-input v-model="form.drug_remark" style="width:180px"></el-input>
+           </el-form-item>
             <!-- <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="经销商 : " prop="dealer" style="width:100%">
+          <el-form-item label="经销商: " prop="dealer" style="width:100%">
              
                <el-select v-model="form.dealer" style="width:100%;" filterable placeholder="请选择">
                   <el-option
@@ -428,6 +456,10 @@
           is_charge_use: '',//是否收费常用项
           drug_code:'',
           dealer:'',
+          prescription_mark:"",//处方药标志
+          social_security_directory_code:"",//社保目录编码
+          record_date:"",//备案日期
+          drug_remark:"",//药品备注
         },
 
         rules: {
@@ -447,7 +479,11 @@
           drug_classify: [{ required: true, message: '请选择药物分类',trigger: 'change'  }],
           drug_dose: [{ required: true, message: '请填写剂量',trigger: 'blur'  }],
           manufacturer: [{ required: true, message: '请选择生产产商',trigger: 'change'  }],
-          dealer:[{required:true,message:'请选择经销商',trigger:'change'}]
+          dealer:[{required:true,message:'请选择经销商',trigger:'change'}],
+          prescription_mark:[{required:true,message:"请选择处方药标志"}],
+          social_security_directory_code:[{required:true,message:"请填写社保目录编码"}],
+          record_date:[{required:true,message:"请选择备案日期"}],
+          drug_remark:[{required:true,message:"请填写药品备注"}]
         },
         page:1,
         limit:500,
@@ -502,6 +538,7 @@
         this.form.intro = ''
       },
       show(id,obj) {
+        console.log("obj222",obj)
         // this.clear()
         this.visible = true
         if (id == 0) {
@@ -549,6 +586,10 @@
       ,
       hide() {
         // this.clear()
+        this.form.social_security_directory_code = ""
+        this.form.prescription_mark = ""
+        this.form.record_date = ""
+        this.form.drug_remark = ""
         this.visible = false
       },
       getValue: function() {
@@ -600,8 +641,10 @@
         form['drug_code'] = this.form.drug_code
         form['drug_classify'] = this.form.drug_classify
         form['dealer'] = this.form.dealer
-
-
+        form['prescription_mark'] = this.form.prescription_mark
+        form['social_security_directory_code'] = this.form.social_security_directory_code
+        form['record_date'] = this.form.record_date
+        form['drug_remark'] = this.form.drug_remark
         return form
       },
       getlist(){
@@ -609,7 +652,7 @@
              page:this.page,
              limit:this.limit
           }
-          console.log("params2222222",params)
+         
         getManufacturerList(params).then(response=>{
            var manufacturerList =   response.data.data.manufacturer
            console.log("列表2222222",manufacturerList)

src/xt_pages/data/components/addProject.vue

@@ -119,12 +119,22 @@
                           <el-form-item label="总量 : " prop="medical_code">
                             <el-input v-model="form.total" style="width:160px;" placeholder="" maxlength="30"></el-input>
                         </el-form-item>
-                        <el-form-item label="状态 : " prop="medical_status" style="width:100%;">
+                        <el-form-item label="状态 : " prop="medical_status">
                             <el-radio-group v-model="form.medical_status">
                                 <el-radio :label="1">停用</el-radio>
                                 <el-radio :label="2">收费</el-radio>
                             </el-radio-group>
                         </el-form-item>
+                        <el-form-item label="类别:" prop="">
+                           <el-select v-model="form.category" style="width:160px;" placeholder="请选择">
+                              <el-option
+                                v-for="(item,index) in categoryList"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.id">
+                                </el-option>
+                            </el-select>
+                        </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>
@@ -261,7 +271,12 @@ export default {
                 cost_classify: [{ required: true, message: '请填写费用类别',trigger: 'blur' }],
                 executive_section: [{ required: true, message: '请填写执行科室',trigger: 'blur'  }],
                 medical_coverage: [{ required: true, message: '请填写医保等级',trigger: 'blur' }],
-           }
+           },
+           categoryList:[
+             {id:1,name:"常规诊疗项目"},
+             {id:4,name:"辅助器具项目"},
+             {id:5,name:"加收项目"}
+           ]
         }
     },
     methods:{
@@ -324,6 +339,7 @@ export default {
                     execution_frequency:this.form.execution_frequency,
                     number_days:this.form.number_days,
                     total:this.form.total,
+                    category:this.form.category,
                }
            
               saveProject(params).then(response=>{

src/xt_pages/data/components/consumables.vue

@@ -16,7 +16,25 @@
             :value="item.value">
           </el-option>
         </el-select>
-        <label class="title"><span class="name">是否收费</span> : </label>
+        <label class="title"><span class="name">生产厂商</span> : </label>
+        <el-select v-model="manufacturer" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeManufacture">
+          <el-option
+            v-for="item in manufacturers"
+            :key="item.id"
+            :label="item.manufacturer_name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+        <span style="color: #909399;font-size:14px;">备案 : &nbsp;</span>
+        <el-select v-model="is_record" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeRecord">
+          <el-option
+            v-for="item in optionOne"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+        <!-- <label class="title"><span class="name">是否收费</span> : </label>
         <el-select v-model="is_charge" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeCharge">
           <el-option
             v-for="item in options"
@@ -37,16 +55,26 @@
             :label="item.name"
             :value="item.id">
           </el-option>
-        </el-select>
+        </el-select> -->
+      </div>
+      <div>
+        <el-button type="primary" @click="openForm()">新增</el-button>
+        <el-button type="primary" @click="BatchDelete()">批量备案</el-button>
       </div>
-      <el-button type="primary" @click="openForm()">新增</el-button>
     </div>
+
     <el-table
       border style="width: 100%" :row-style="{ color: '#303133' }"
       :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}"
       :data="goodInfo.goodInfoData"
       v-loading="goodInfo.loading"
+      @selection-change="handleSelectionChange"
     >
+      <el-table-column
+          align="center"
+          type="selection"
+          width="55">
+      </el-table-column>    
       <el-table-column type="index" label="序号" width="60px" align="center"></el-table-column>
       <el-table-column label="耗材名称" align="center">
         <template slot-scope="scope">
@@ -94,6 +122,11 @@
           <el-button @click="handleGoodInfoEdit(scope.$index, scope.row)" type="primary" size="small">编辑</el-button>
           <!--<el-button type="primary" size="small" @click="clickSelfPayment(scope.row.id)">自付比例</el-button>-->
           <el-button type="danger" size="small" @click="handleGoodInfoDelete(scope.$index, scope.row)">删除</el-button>
+
+          <el-button type="primary" size="small" icon="el-icon-refresh-left" @click="toReturn(scope.row.id,scope.row.is_mark)">
+             <span v-if="scope.row.is_mark == 0">备案</span>
+             <span v-if="scope.row.is_mark == 1">撤销</span>
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -127,7 +160,7 @@
   import GoodInfoDailog from '../../stock/Dialog/goodInfoDailog'
   import { getDictionaryDataConfig } from "@/utils/data";
   import selfPayment from './selfPayment'
-
+  import axios from 'axios'
   import {
     createGoodInfo,
     deleteGoodInfo,
@@ -215,12 +248,29 @@
               sort:'',
               is_doctor_use:'',
               good_number:'',
-
+              social_security_directory_code:"",
+              special_medical:"",
+              production_type:""
             },
 
             isVisibility: false
           }
-        }
+        },
+        selectDrug:[],
+        manufacturers:[],
+        optionOne: [
+          {
+            value: '0',
+            label: '全部'
+          }, {
+            value: '1',
+            label: '已备案'
+          }, {
+            value: '2',
+            label: '未备案'
+        }],
+        is_record:"",
+        manufacturer:""
       }
     },
     methods: {
@@ -454,14 +504,24 @@
                 response.data.data.goodInfo.is_doctor_use.toString()
             }
 
-            this.goodInfo.goodInfoDialog.formValue.agent =
-              response.data.data.goodInfo.agent
-
-            this.goodInfo.goodInfoDialog.formValue.good_number =
-              response.data.data.goodInfo.good_number
-
+            this.goodInfo.goodInfoDialog.formValue.agent =response.data.data.goodInfo.agent
 
+            this.goodInfo.goodInfoDialog.formValue.good_number = response.data.data.goodInfo.good_number
+            
+            this.goodInfo.goodInfoDialog.formValue.social_security_directory_code = response.data.data.goodInfo.social_security_directory_code
+            
+            if(response.data.data.production_type<=0){
+               this.goodInfo.goodInfoDialog.production_type = ''
+            }else{
+              this.goodInfo.goodInfoDialog.formValue.production_type = response.data.data.goodInfo.production_type.toString()
+            }
 
+            if(response.data.data.special_medical<=0){
+               this.goodInfo.goodInfoDialog.special_medical = ''
+            }else{
+              this.goodInfo.goodInfoDialog.formValue.special_medical = response.data.data.goodInfo.special_medical.toString()
+            }
+        
             this.$refs.addConsumable.show(row.id, this.goodInfo.goodInfoDialog.formValue)
           }
         })
@@ -499,6 +559,8 @@
           is_use:this.is_use,
           good_kind:this.good_kind,
           is_charge: this.is_charge,
+          is_mark:this.is_record,
+          manufacturer:this.manufacturer,
         }
         console.log("222222",params)
         getGoodInfoList(params).then(response => {
@@ -649,11 +711,15 @@
             this.$message.error(response.data.msg)
             return false
           } else {
+            var obj = {id:0,manufacturer_name:"全部"}
+            this.manufacturers.push(obj)
             for (let i = 0; i < response.data.data.manufacturer.length; i++) {
               this.goodInfo.goodInfoDialog.formValue.manufacturers.push(
                 response.data.data.manufacturer[i]
               )
+              this.manufacturers.push(response.data.data.manufacturer[i])
             }
+            console.log("生产厂商888222",this.manufacturers)
           }
         })
       },
@@ -752,7 +818,88 @@
         this.goodInfo.goodInfoDialog.formValue.good_number = ''
 
         this.$refs.addConsumable.show(0)
-      }
+      },
+     handleSelectionChange(val) {
+      this.selectDrug = val;
+     },
+      // toRecord(){
+
+      //    var that = this
+      //    axios.get('http://127.0.0.1:9532/sz/api/goods/get').then(function(response) {
+      //     if (response.data.state == 0) {
+      //          that.$message.error(response.data.msg)
+      //          return false
+      //       } else {
+      //         that.$message({ message: '备案成功', type: 'success' })
+      //        }
+      //      }).catch(function(error) {
+      //   })
+      // },
+       BatchDelete() {
+          if (this.selectDrug.length == 0) {
+            this.$message.error("请选择要备案的信息");
+            return false;
+          }
+          this.$confirm(
+            "确认要备案所选记录吗? <br>",
+            "备案提示",
+            {
+              dangerouslyUseHTMLString: true,
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning"
+            }
+          ).then(() => {
+            var ids = [];
+            var idMap = {};
+            for (const index in this.selectDrug) {
+              ids.push(this.selectDrug[index].id);
+              idMap[this.selectDrug[index].id] = this.selectDrug[index].id;
+            }
+            console.log('ids222222222',ids)
+            var idss = ids.join(',')
+            let params = {
+              ids:idss
+            }
+        
+            var that = this
+            axios.get('http://127.0.0.1:9532/sz/api/goods/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.getList()
+                }
+              }).catch(function(error) {
+            })
+          });
+     },
+      toReturn(id,isMark){
+        
+         var that = this
+         let params = {
+             'id':id,
+             'type_id':3,
+             'is_mark':isMark
+          }
+         axios.get('http://127.0.0.1:9532/sz/api/revocation/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.getList()
+             }
+           }).catch(function(error) {
+        })
+      },
+      changeManufacture(){
+        this.getList()
+      },
+      changeRecord(){
+         this.getList()
+      },
     }, created() {
       this.getList()
       this.getAllDealer()

src/xt_pages/data/components/drugTable.vue

@@ -199,6 +199,7 @@
         this.temp.config_field = newValue.replace(/[^A-Za-z]/g, "");
       },
       handleRowChange(currentRow, oldCurrentRow) {
+       
         if (currentRow != undefined) {
           this.currentId = currentRow.id;
           bus.$emit("drugParentChangeId", currentRow);

src/xt_pages/data/components/drugTableSon.vue

@@ -84,6 +84,17 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+             <el-form-item label="代码" prop="order" v-show="showOne">
+              <el-input
+                type="age"
+                v-model="temp.code"
+                placeholder="请输入代码"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-form-item :label="$t('data_config.remark')">
           <el-input
             type="textarea"
@@ -203,7 +214,8 @@
           field_name: undefined,
           value: "",
           remark: "",
-          orders: 0
+          orders: 0,
+          code:""
         },
         dialogFormVisible: false,
         dialogStatus: "",
@@ -223,7 +235,8 @@
         },
         downloadLoading: false,
         parentConfig: undefined,
-        addState: true
+        addState: true,
+        showOne:false
       };
     },
     computed: {
@@ -260,6 +273,14 @@
     mounted() {
       var _this = this;
       bus.$on("drugParentChangeId", function(parentData) {
+        console.log("parentData22222",parentData)
+         if(parentData.name == "药品剂型"){
+           console.log("333333")
+           _this.showOne = true
+         }else{
+           _this.showOne = false
+         }
+
         _this.parentConfig = parentData;
         // _this.list = parentData.childs
         console.log(parentData)
@@ -368,8 +389,13 @@
         });
       },
       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

@@ -7,7 +7,7 @@
         <el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search"
                    @click="searchAction">搜索
         </el-button>
-        <label class="title"><span class="name">是否启用</span> : </label>
+        <!-- <label class="title"><span class="name">是否启用</span> : </label>
         <el-select v-model="is_use" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeUser">
           <el-option
             v-for="item in options"
@@ -15,6 +15,15 @@
             :label="item.label"
             :value="item.value">
           </el-option>
+        </el-select> -->
+       <label class="title"><span class="name">生产厂商</span> : </label>
+        <el-select v-model="manufacturer" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeManufacture">
+          <el-option
+            v-for="item in manufacturers"
+            :key="item.id"
+            :label="item.manufacturer_name"
+            :value="item.id">
+          </el-option>
         </el-select>
         <label class="title"><span class="name">是否收费</span> : </label>
         <el-select v-model="is_charge" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeCharge">
@@ -25,7 +34,7 @@
             :value="item.value">
           </el-option>
         </el-select>
-        <span style="color: #909399;font-size:14px;">是否注射类别 : &nbsp;</span>
+        <!-- <span style="color: #909399;font-size:14px;">是否注射类别 : &nbsp;</span>
         <el-select v-model="is_inject" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeInject">
           <el-option
             v-for="item in options"
@@ -33,52 +42,106 @@
             :label="item.label"
             :value="item.value">
           </el-option>
+        </el-select> -->
+
+        <span style="color: #909399;font-size:14px;">备案 : &nbsp;</span>
+        <el-select v-model="is_record" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeRecord">
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
         </el-select>
       </div>
-      <el-button type="primary" @click="openForm(0)">新增</el-button>
+      <div>
+        <el-button type="primary" @click="openForm(0)">新增</el-button>
+        <el-button type="primary" @click="BatchDelete()">批量备案</el-button>
+      </div>
     </div>
     <el-table :data="list" border style="width: 100%" :row-style="{ color: '#303133' }"
-              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}">
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}"
+             @selection-change="handleSelectionChange">
+       <el-table-column
+          align="center"
+          type="selection"
+          width="55"
+       ></el-table-column>        
       <el-table-column type="index" label="序号" width="60px" align="center"></el-table-column>
 
-      <el-table-column prop="date" label="药品名称" align="center">
+      <el-table-column prop="date" label="药品名称" align="center" width="100">
         <template slot-scope="scope">
           <div>{{scope.row.drug_name}}</div>
         </template>
-
       </el-table-column>
-      <el-table-column prop="date" label="生产厂商" align="center">
+      <el-table-column prop="date" label="规格" width="60" align="center">
         <template slot-scope="scope">
-          <div>{{getName(scope.row.manufacturer)}}</div>
+          <div>{{scope.row.drug_spec}}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="date" label="规格" width="140" align="center">
+      <el-table-column prop="date" label="最大单位" width="60" align="center">
         <template slot-scope="scope">
-          <div>{{scope.row.drug_spec}}</div>
+          <div>{{scope.row.max_unit}}</div>
         </template>
       </el-table-column>
       <el-table-column label="最小单位" width="60" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.min_unit}}</div>
         </template>
-
+      </el-table-column>
+      <el-table-column prop="date" label="进货价" width="60" align="center">
+        <template slot-scope="scope">
+          <div>{{scope.row.last_price}}</div>
+        </template>
       </el-table-column>
       <el-table-column label="零售价" width="60" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.retail_price}}</div>
         </template>
+      </el-table-column>
+       <el-table-column prop="date" label="医保编码" width="100" align="center">
+        <template slot-scope="scope">
+          <div>{{scope.row.medical_insurance_number}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="date" label="药品本位码" width="100" align="center">
+        <template slot-scope="scope">
+          <div>{{scope.row.code}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="date" label="生产厂商" align="center" width="100">
+        <template slot-scope="scope">
+          <div>{{getName(scope.row.manufacturer)}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="date" label="经销商" align="center" width="100">
+        <template slot-scope="scope">
+          <div>{{getDealer(scope.row.dealer)}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="date" label="备案日期" align="center" width="100">
+        <template slot-scope="scope">
+          <span>{{getTime(scope.row.record_date)}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="date" label="药品备注" align="center" width="100">
+        <template slot-scope="scope">
+          <div>{{scope.row.drug_remark}}</div>
+        </template>
       </el-table-column>
       <el-table-column label="状态" width="60" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.drug_status.indexOf('停用') == -1 ? '启用':'停用' }}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="date" label="操作" width="400" align="center">
+      <el-table-column prop="date" label="操作" width="250" align="center" fixed="right">
         <template slot-scope="scope">
           <el-button @click="openForm(scope.row.id)" type="primary" size="small">编辑</el-button>
-          <!--<el-button type="primary" size="small" @click="clickSelfPayment(scope.row.id)">自付比例</el-button>-->
-          <!--<el-button type="primary" size="small" @click="clickMainTain">单位维护</el-button>-->
           <el-button type="danger" size="small" @click="deleteDurg(scope.row.id,scope.$index)">删除</el-button>
+        <el-button type="primary" size="small" icon="el-icon-refresh-left" @click="toReturn(scope.row.id,scope.row.is_mark)">
+          <span v-if="scope.row.is_mark == 0">备案</span>
+          <span v-if="scope.row.is_mark == 1">撤消</span>
+        </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -110,11 +173,13 @@
 </template>
 
 <script>
+  import axios from 'axios'
   import selfPayment from './selfPayment'
   import maintain from './maintain'
   import addDrugs from './addDrugs'
   import { GetAllManufacturer } from '@/api/stock'
   import { getDataConfig } from "@/utils/data";
+  import { uParseTime } from '@/utils/tools'
   import {
     createBaseDrugLib,
     createDrugUnitSafeguard,
@@ -124,7 +189,7 @@
     getBaseDrugLibList,
     deleteDurg
   } from '@/api/data'
-
+ import {GetAllConfig } from "@/api/stock";
   export default {
     components: {
       selfPayment,
@@ -138,9 +203,11 @@
         keywords: '',
         is_use: '',
         is_charge: '',
+        manufacturer:'',
+        is_record:"",
         is_inject: '',
         list: [],
-
+    
         isCreated: 1,
         manufacturers: [],
         title: '',
@@ -251,30 +318,15 @@
             label: '全部'
           }, {
             value: '1',
-            label: '是'
+            label: '已备案'
           }, {
             value: '2',
-            label: '否'
+            label: '未备案'
           }],
         value: '',
-        tableData: [{
-          date: '2016-05-02',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1518 弄'
-        }, {
-          date: '2016-05-04',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1517 弄'
-        }, {
-          date: '2016-05-01',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1519 弄'
-        }, {
-          date: '2016-05-03',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1516 弄'
-        }]
-
+       
+        dealer:[],
+        selectDrug:[],
       }
     },
     methods: {
@@ -292,11 +344,15 @@
       },
       changeCharge(val) {
         this.getList()
-
       },
       changeUser(val) {
         this.getList()
-
+      },
+      changeManufacture(){
+        this.getList()
+      },
+      changeRecord(){
+         this.getList()
       },
       getName(id) {
         for (let i = 0; i < this.manufacturers.length; i++) {
@@ -306,6 +362,15 @@
         }
         return ''
       },
+      getDealer(id){
+        var name = ""
+        for(let i=0;i<this.dealer.length;i++){
+          if(this.dealer[i].id == id){
+             name = this.dealer[i].dealer_name
+          }
+        }
+        return name
+      },
       goodInfoDialogComfirm: function(val) {
 
         //修改自备药
@@ -356,11 +421,13 @@
             this.$message.error(response.data.msg)
             return false
           } else {
+              var obj = {id:0,manufacturer_name:"全部"}
+              this.manufacturers.push(obj)
+          
             for (let i = 0; i < response.data.data.manufacturer.length; i++) {
-              this.manufacturers.push(
-                response.data.data.manufacturer[i]
-              )
+              this.manufacturers.push(response.data.data.manufacturer[i])
             }
+          
           }
         })
       },
@@ -453,6 +520,14 @@
 
               }
 
+              if(this.formValue.prescription_mark<=0){
+                  this.formValue.prescription_mark = ''
+              }else{
+                this.formValue.prescription_mark = this.formValue.prescription_mark.toString()
+              }
+
+              this.formValue.record_date = this.getTime(this.formValue.record_date)
+
               this.$refs.addDrugs.show(id, this.formValue)
 
             }
@@ -495,7 +570,9 @@
           keyword: this.keywords,
           is_use: this.is_use,
           is_charge: this.is_charge,
-          is_inject: this.is_inject
+          is_inject: this.is_inject,
+          manufacturer:this.manufacturer,
+          is_record:this.is_record
         }
         getBaseDrugLibList(params).then(response => {
           if (response.data.state == 0) {
@@ -504,6 +581,7 @@
           } else {
             this.total = response.data.data.total
             this.list = []
+            console.log("333333333",response.data.data.list)
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.list.push(response.data.data.list[i])
             }
@@ -513,10 +591,106 @@
      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) {
+        })
+      },
+      toReturn(id,isMark){
+        console.log("id2222",id)
+         var that = this
+         let params = {
+             'id':id,
+             'type_id':1,
+             'is_mark':isMark,
+          }
+         axios.get('http://127.0.0.1:9532/sz/api/revocation/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.getList()
+             }
+           }).catch(function(error) {
+        })
+      },
+     GetAllConfig(){
+        GetAllConfig().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.dealer = response.data.data.dealer;
+         
+        }
+       });
+      },
+      getTime(val) {
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
 
-    }, created() {
+      handleSelectionChange(val){
+        this.selectDrug = val
+      },
+
+      BatchDelete() {
+      if (this.selectDrug.length == 0) {
+        this.$message.error("请选择要备案的信息");
+        return false;
+      }
+      this.$confirm(
+        "确认要备案所选记录吗? <br>",
+        "备案提示",
+        {
+          dangerouslyUseHTMLString: true,
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }
+      ).then(() => {
+        var ids = [];
+        var idMap = {};
+        for (const index in this.selectDrug) {
+          ids.push(this.selectDrug[index].id);
+          idMap[this.selectDrug[index].id] = this.selectDrug[index].id;
+        }
+        console.log('ids222222222',ids)
+        var idss = ids.join(',')
+        let params = {
+          ids:idss
+        }
+     
+        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) {
+               that.$message.error(response.data.msg)
+               return false
+            } else {
+              that.$message({ message: '备案成功', type: 'success' })
+              that.getList()
+             }
+           }).catch(function(error) {
+        })
+       });
+     },
+    }, 
+    created() {
       this.getList()
       this.getAllManufacturer()
+      this.GetAllConfig()
     }
   }
 </script>

src/xt_pages/data/components/editProject.vue

@@ -119,12 +119,22 @@
                           <el-form-item label="总量 : " prop="medical_code">
                             <el-input v-model="form.total" style="width:160px;" placeholder="" maxlength="30"></el-input>
                         </el-form-item>
-                        <el-form-item label="状态 : " prop="medical_status" style="width:100%;">
+                        <el-form-item label="状态 : " prop="medical_status">
                             <el-radio-group v-model="form.medical_status">
                                 <el-radio :label="1">停用</el-radio>
                                 <el-radio :label="2">收费</el-radio>
                             </el-radio-group>
                         </el-form-item>
+                        <el-form-item label="类别:" prop="">
+                           <el-select v-model="form.category" style="width:160px;" placeholder="请选择">
+                              <el-option
+                                v-for="(item,index) in categoryList"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.id">
+                                </el-option>
+                            </el-select>
+                        </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>
@@ -256,7 +266,8 @@ export default {
               delivery_way:"",
               execution_frequency:"",
               number_days:"",
-              total:""
+              total:"",
+              category:""
             },
             rules: {
                 project_name: [{ required: true, message: '请填写项目名称', trigger: 'blur'  }],
@@ -267,7 +278,12 @@ export default {
                 cost_classify: [{ required: true, message: '请填写费用类别',trigger: 'blur' }],
                 executive_section: [{ required: true, message: '请填写执行科室',trigger: 'blur'  }],
                 medical_coverage: [{ required: true, message: '请填写医保等级',trigger: 'blur' }],
-           }
+           },
+          categoryList:[
+             {id:1,name:"常规诊疗项目"},
+             {id:4,name:"辅助器具项目"},
+             {id:5,name:"加收项目"}
+           ]
         }
     },
     methods:{
@@ -329,6 +345,7 @@ export default {
               this.form.execution_frequency = projecDetail.execution_frequency
               this.form.number_days = projecDetail.number_days
               this.form.total = projecDetail.total
+              this.form.category = projecDetail.category
             }
          })
        },
@@ -367,6 +384,7 @@ export default {
                     execution_frequency:this.form.execution_frequency,
                     number_days:this.form.number_days,
                     total:this.form.total,
+                    category:this.form.category
                }
               
               updatedProject(params).then(response=>{

src/xt_pages/data/components/project.vue

@@ -22,10 +22,27 @@
                     :value="item.value">
                     </el-option>
                 </el-select>
+                <label class="title"><span class="name">备案:</span> : </label>
+                <el-select v-model="is_mark" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeRecord">
+                  <el-option
+                    v-for="item in optionOne"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+            </div>
+            <div>
+             <el-button type="primary" @click="openForm(0)">新增</el-button>
+             <el-button type="primary" @click="BatchDelete()">批量备案</el-button>
             </div>
-            <el-button type="primary" @click="openForm(0)">新增</el-button>
         </div>
-        <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}">
+        <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}"  @selection-change="handleSelectionChange">
+            <el-table-column
+              align="center"
+              type="selection"
+              width="55">
+            </el-table-column>  
             <el-table-column prop="date" label="序号" width="80" align="center">
                  <template  slot-scope="scope">
                       {{scope.$index+1}}
@@ -62,6 +79,10 @@
                 <template slot-scope="scope">
                     <el-button @click="editHisProject(scope.row.id)" type="primary" size="small">编辑</el-button>
                     <el-button type="danger" size="small" @click="deleteProject(scope.row.id,scope.$index)">删除</el-button>
+                    <el-button type="primary" size="small" icon="el-icon-refresh-left" @click="toReturn(scope.row.id,scope.row.is_mark)">
+                      <span v-if="scope.row.is_mark ==0">备案</span>
+                      <span v-if="scope.row.is_mark ==1">撤销</span>
+                    </el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -88,6 +109,7 @@ import addProject from './addProject'
 import editProject from './editProject'
 import { getProjectList,deleteHisProject } from "@/api/project/project"
 import { getDictionaryDataConfig } from "@/utils/data";
+import axios from 'axios'
 export default {
     components:{
         addProject,
@@ -112,7 +134,20 @@ export default {
             total:0,
             tableData: [],
             is_start:0,
-            is_charge:0
+            is_charge:0,
+            selectDrug:[],
+            optionOne: [
+            {
+              value: '0',
+              label: '全部'
+            }, {
+              value: '1',
+              label: '已备案'
+            }, {
+              value: '2',
+              label: '未备案'
+          }],
+         is_mark:""
         }
     },
     methods:{
@@ -169,6 +204,7 @@ export default {
                is_start:this.is_start,
                limit:this.limit,
                page:this.page,
+               is_mark:this.is_mark,
             }
            console.log("222",params)
           getProjectList(params).then(response=>{
@@ -200,8 +236,90 @@ export default {
         },
         changeOption(){
           this.getlist()
+        },
+
+        toRecord(){
+         var that = this
+         axios.get('http://127.0.0.1:9532/sz/api/treatment/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
+         let params = {
+             'id':id,
+             'type_id':2,
+             'is_mark':isMark,
+          }
+          console.log("params22222222",params)
+         
+         axios.get('http://127.0.0.1:9532/sz/api/revocation/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.getlist()
+             }
+           }).catch(function(error) {
+        })
+      },
+      handleSelectionChange(val) {
+        this.selectDrug = val;
+      }, 
+    changeRecord(){
+      this.getlist()
+    },
+      
+    BatchDelete() {
+      if (this.selectDrug.length == 0) {
+        this.$message.error("请选择要备案的信息");
+        return false;
+      }
+      this.$confirm(
+        "确认要备案所选记录吗? <br>",
+        "备案提示",
+        {
+          dangerouslyUseHTMLString: true,
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
         }
-        
+      ).then(() => {
+        var ids = [];
+        var idMap = {};
+        for (const index in this.selectDrug) {
+          ids.push(this.selectDrug[index].id);
+          idMap[this.selectDrug[index].id] = this.selectDrug[index].id;
+        }
+        console.log('ids222222222',ids)
+        var idss = ids.join(',')
+        let params = {
+          ids:idss
+        }
+     
+        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) {
+               that.$message.error(response.data.msg)
+               return false
+            } else {
+              that.$message({ message: '备案成功', type: 'success' })
+              that.getList()
+             }
+           }).catch(function(error) {
+        })
+       });
+     },
     },
     created(){
       this.getlist()

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -166,10 +166,10 @@
         </el-select>
       </el-form-item>
       <el-form-item label="挂号费：">
-        <el-input v-model.number="form.registration_fee"></el-input>
+        <el-input v-model="form.registration_fee"></el-input>
       </el-form-item>
       <el-form-item label="诊疗费：">
-        <el-input v-model.number="form.medical_expenses"></el-input>
+        <el-input v-model="form.medical_expenses"></el-input>
       </el-form-item>
     </el-form>
 
@@ -203,7 +203,6 @@
           {value: 15, label: "门诊统筹"},
           {value: 16, label: "门诊慢性病"},
           {value: 21, label: "普通住院"},
-
         ],
         form: {
           id: '',
@@ -291,8 +290,7 @@
         }, {
           value: 6,
           label: "城乡居民大病医疗保险"
-        },
-          {
+        }, {
             value: 7,
             label: "生育保险"
           }],
@@ -323,17 +321,13 @@
           birthday: [{required: true, message: "患者出生日期不能为空", trigger: 'blur'}],
           certificates: [{required: true, message: "证件类型不能为空", trigger: 'change'}],
           id_card_type: [{required: true, message: "读卡类型不能为空", trigger: 'change'}],
-
           p_type: [{required: true, message: "处方类型不能为空", trigger: 'change'}],
           sick_type: [{required: true, message: "大病类别不能为空", trigger: 'change'}],
           diagnosis: [{required: true, message: "诊断不能为空", trigger: 'change'}],
-
         },
-
         visibility: false,
         labelPosition: 'right',
         isClose: false,
-
         resetForm: {
           settlement_value: '',
           medical_insurance_card: '',

src/xt_pages/outpatientCharges/template/printOne.vue

@@ -35,7 +35,7 @@
             <p>核对：</p>
             <p>发药：</p>
             <p>药费：</p>
-        </div>
+        </div> b
     </div>
 </template>
 
@@ -97,7 +97,7 @@
 }
 .actionBar{
     display: flex;
-    justify-content: space-between; 
+    justify-content: space-between;
     line-height: 24px;
     padding:0 10px;
 }

src/xt_pages/outpatientDoctorStation/recordTemplate/printOne.vue

@@ -12,8 +12,9 @@
         </div>
         <div class="infoTitle">
             <div>婚姻状况：
-              <span v-if="patient.marital_status == 1">已婚 </span>
-              <span v-if="patient.marital_status == 2">未婚 </span>
+              <span v-if="patient.marital_status == 1">未婚</span>
+              <span v-if="patient.marital_status == 2">已婚</span>
+              <span v-if="patient.marital_status == 3">离异</span>
             </div>
             <div>职业：{{getProfession(patient.profession)?getProfession(patient.profession):''}}</div>
         </div>

src/xt_pages/role/admin.vue

@@ -2,16 +2,25 @@
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
-      <!-- <router-link to="/role/admin/create"> -->
-      <el-button
+     
+       <div style="position: fixed;margin-left:950px">
+        <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"
-        icon="el-icon-circle-plus-outline"
-        style="float:right;"
-        @click="openForm(0)"
-        >新增</el-button
-      >
-      <!-- </router-link> -->
+        @click="toLogin"
+        >医药师登记</el-button> -->
+        <el-button
+        type="primary"
+        size="small"
+        @click="BatchDelete"
+        >医药师登记</el-button>
     </div>
     <div class="app-container">
       <el-table
@@ -25,7 +34,13 @@
         border
         :data="admins"
         v-loading="is_loading_admins"
-      >
+        @selection-change="handleSelectionChange"
+      > 
+        <el-table-column
+              align="center"
+              type="selection"
+              width="55">
+        </el-table-column>  
         <el-table-column
           label="用户名"
           prop="user_name"
@@ -71,7 +86,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="120" align="center">
+        <el-table-column label="操作" width="240" align="center">
           <template slot-scope="scope">
             <!-- <router-link :to="{ path:'/role/admin/edit', query:{ id:scope.row.user_id }}"> -->
             <el-tooltip
@@ -124,6 +139,12 @@
                 @click="recoverAdminAction(scope.row)"
               ></el-button>
             </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 ==1">撤销</span>
+              </el-button>
+            </span>
           </template>
         </el-table-column>
       </el-table>
@@ -151,7 +172,7 @@ import { getRoles } from "@/api/role/role";
 import { parseTime } from "@/utils";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import AdminInfoForm from "./components/AdminInfoForm";
-
+import axios from 'axios'
 export default {
   name: "adminManage",
   data() {
@@ -168,8 +189,8 @@ export default {
       is_exist_role: false,
       org: null,
       isSubSuperAdmin: false,
-
-      local_user_id: 0
+      local_user_id: 0,
+      selectDrug:[]
     };
   },
   components: {
@@ -265,6 +286,7 @@ export default {
           console.log(resp);
           if (resp.state === 1) {
              var admindata = resp.data.admins
+          
             this.admins.push(...admindata);
             this.admin_total_count = resp.data.total_count;
           } else {
@@ -341,7 +363,84 @@ export default {
     },
     pageChange: function(nextPage) {
       this.requestAdminsWithPage(nextPage);
-    }
+    },
+  //  toLogin(){
+  //     var that = this
+  //     axios.get('http://127.0.0.1:9532/sz/api/doctor/get').then(function(response) {
+  //     if (response.data.state == 0) {
+  //         that.$message.error(response.data.msg)
+  //         return false
+  //       } else {
+  //         that.$message({ message: '登记成功', type: 'success' })
+  //         }
+  //        }).catch(function(error) {
+  //     })
+  //   },
+
+   BatchDelete() {
+      if (this.selectDrug.length == 0) {
+        this.$message.error("请选择要登记的信息");
+        return false;
+      }
+      this.$confirm(
+        "确认要登记所选记录吗? <br>",
+        "备案提示",
+        {
+          dangerouslyUseHTMLString: true,
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }
+      ).then(() => {
+        var ids = [];
+        var idMap = {};
+        console.log("3333333",this.selectDrug)
+        for (const index in this.selectDrug) {
+          ids.push(this.selectDrug[index].user_id);
+          idMap[this.selectDrug[index].user_id] = this.selectDrug[index].user_id;
+        }
+        console.log('ids222222222',ids)
+        var idss = ids.join(',')
+        let params = {
+          ids:idss
+        }
+     
+        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) {
+               that.$message.error(response.data.msg)
+               return false
+            } else {
+              that.$message({ message: '操作成功', type: 'success' })
+              that.adminMainView()
+             }
+           }).catch(function(error) {
+        })
+       });
+     },
+     toReturn(id,is_mark){
+       var that = this
+         let params = {
+           'id':id,
+           "is_mark":is_mark,
+        }
+        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' })
+              this.$message.error(response.data.msg)
+              that.adminMainView()
+             }
+           }).catch(function(error) {
+        })
+     },
+
+   handleSelectionChange(val) {
+      this.selectDrug = val;
+    },
   },
   watch: {
     should_update_admins(should_change) {

src/xt_pages/role/components/AdminInfoForm.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="formTitle" :visible.sync="dialogFormVisible"  width="1000px">
+  <el-dialog :title="formTitle" :visible.sync="dialogFormVisible"  width="63%">
     <el-form :model="form" ref="form" :rules="rules" label-width="130px">
      <el-row :gutter="24">
         <el-col :span="24">
@@ -70,7 +70,7 @@
    </el-row>
   
   <div v-show="show">
-   <el-row :gutter="24">
+   <el-row :span="24">
     <el-col :span="8">
       <el-form-item label="性别:">
         <el-select v-model="form.sex" placeholder="性别" style="width:180px;">
@@ -89,7 +89,7 @@
       </el-form-item>
     </el-col>
     <el-col :span="8">
-      <el-form-item label="执业状态:">
+      <el-form-item label="执业状态">
            <el-select v-model="form.active_status" placeholder="执业状态" style="width:180px;">
               <el-option
                 v-for="item in activeStausList"
@@ -158,7 +158,7 @@
   <el-row :gutter="24">
     <el-col :span="8">
        <el-form-item label="人员类别:">
-           <el-select v-model="form.role_type" placeholder="人员类别" @change="changeRoleType" style="width:180px;">
+           <el-select v-model="form.role_type" placeholder="人员类别" @change="changeRoleType" style="width:150px;">
               <el-option
                 v-for="item in roleList"
                 :label="item.name"
@@ -171,12 +171,12 @@
     </el-col>
      <el-col :span="8">
        <el-form-item label="医药师资格证编码:">
-           <el-input v-model="form.medical_code" style="width:180px;"></el-input>
+           <el-input v-model="form.medical_code" style="width:170px;"></el-input>
        </el-form-item>
     </el-col>
     <el-col :span="8">
        <el-form-item label="医药师职业证编码:">
-          <el-input v-model="form.doctor_code" style="width:180px;"></el-input>
+          <el-input v-model="form.doctor_code" style="width:170px;"></el-input>
        </el-form-item>
     </el-col>
   </el-row>
@@ -303,7 +303,7 @@
    <el-row :gutter="24">
     <el-col :span="8">
        <el-form-item label="医师执业范围代码:" v-show="showTwo">
-           <el-select v-model="form.doctor_range_code" placeholder="医生执业范围代码" style="width:180px;">
+           <el-select v-model="form.doctor_range_code" placeholder="医生执业范围代码">
               <el-option
                 v-for="item in doctorRangeList"
                 :label="item.name"
@@ -317,7 +317,7 @@
      <el-col :span="8">
        <el-form-item label="医生级别:" label-width="130px" v-show="showTwo">
           
-             <el-select v-model="form.doctor_level" placeholder="医生级别" style="width:180px;">
+             <el-select v-model="form.doctor_level" placeholder="医生级别">
               <el-option
                 v-for="item in doctorLevelList"
                 :label="item.name"
@@ -329,7 +329,7 @@
     </el-col>
     <el-col :span="8">
        <el-form-item label="执业类别:" v-show="showTwo">
-            <el-select v-model="form.doctor_type_job" placeholder="执业类别" style="width:180px;">
+            <el-select v-model="form.doctor_type_job" placeholder="执业类别">
               <el-option
                 v-for="item in typeJobList"
                 :label="item.name"
@@ -346,12 +346,12 @@
     <el-col :span="8">
        <el-form-item label="医保医师编码:">
          
-        <el-input v-model="form.doctor_number" style="width:180px;"></el-input>
+        <el-input v-model="form.doctor_number"></el-input>
        </el-form-item>
     </el-col>
      <el-col :span="8">
        <el-form-item label="门诊大病类别:" label-width="130px">
-            <el-select v-model="form.outpatient_illnessCategory" placeholder="门诊大病类别" style="width:180px;">
+            <el-select v-model="form.outpatient_illnessCategory" placeholder="门诊大病类别">
               <el-option
                 v-for="item in numberList"
                 :label="item.name"
@@ -363,7 +363,7 @@
     </el-col>
     <el-col :span="8">
        <el-form-item label="在职状态:">
-           <el-select v-model="form.is_active" placeholder="在职状态" style="width:180px;">
+           <el-select v-model="form.is_active" placeholder="在职状态">
               <el-option
                 v-for="item in activeList"
                 :label="item.name"
@@ -406,6 +406,7 @@
 </template>
 
 <script>
+  import axios from 'axios'
   import { uParseTime } from '@/utils/tools'
   import Tinymce from '@/components/Tinymce'
   import { addAdmin, getAddAdminInitData, getModifyAdminInitData, modifyAdmin } from '@/api/role/admin'
@@ -700,7 +701,6 @@
                 this.form.mobile = admin.admin.mobile
                 this.form.user_type = admin.user_type
                 if(admin.user_type == 1){
-
                   this.form.user_type = ""
                 }
                 this.form.user_title = admin.user_title
@@ -717,7 +717,8 @@
               
                 this.form.intro = admin.intro
                 this.form.user_title_name = admin.user_title_name
-                if(admin.role_ids.indexOf("1349")!=-1){
+
+                if(this.form.user_type == 2){
                    this.show = true
                 }else{
                   this.show = false
@@ -803,7 +804,7 @@
         this.dialogFormVisible = true
       },
       submitAction: function() {   
-       console.log("第是",this.form.department_id)  
+        
         var department = ""
         for(let i=0;i<this.departMent.length;i++){
           if(this.form.department_id == this.departMent[i].id){
@@ -958,6 +959,22 @@
                   this.loading = false
                   var resp = rs.data
                   if (resp.state === 1) {
+                   if(resp.data.approle.active_status == 2){
+                      let params = {
+                       'id':resp.data.approle.id,
+                       'is_mark':1, 
+                       }
+                     var that = this
+                      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' })
+                          }
+                        }).catch(function(error) {
+                      })
+                    }
                     this.$store.dispatch('DidChangeAdmins')
                     var _this = this
                     setTimeout(() => {
@@ -991,17 +1008,21 @@
         })
       },
       changeRole(arr){
+        console.log("arr",arr)
         console.log("roles",this.roles)
-        // var id = 0
-        // for(let i=0;i<this.roles.length;i++){
-        //    if(this.roles[i].name="医生"){
-        //       id = this.roles[i].id
-        //    }
-        // }
+        var varName = []
+        for(let i=0;i<this.roles.length;i++){
+          for(let j=0;j<arr.length;j++){
+             if(this.roles[i].id == arr[j]){
+                 varName.push(this.roles[i].name)
+             }
+          }
+        }
+        console.log("33333",varName)
         this.form.role_type = 1
-        var ids = arr.join(";")
+        var ids = varName.join(";")
         console.log("valee22222",ids)
-        if(ids.indexOf("1349")!=-1){
+        if(ids.indexOf("医生")!=-1){
            this.show = true
         }else{
            this.show = false

src/xt_pages/role/components/EditAdminInfo.vue

@@ -217,6 +217,7 @@ export default {
                         modifyAdmin(this.form.id, this.form.name, this.form.user_type, this.form.user_title, this.form.role, this.form.intro).then(rs => {
                             this.loading = false
                             var resp = rs.data
+                            
                             if (resp.state === 1) {
                                 this.$store.dispatch('DidChangeAdmins')
                                 var _this = this

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog width="854px"
+  <el-dialog width="870px"
              :title="titles"
              :visible.sync="visible"
              :close-on-click-modal="isClose"
@@ -131,6 +131,36 @@
               </el-checkbox-group>
             </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-select v-model="form.production_type" style="width:160px;" placeholder="请选择">
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+
+          
+
+            <el-form-item label="特殊医用材料标志:">
+              <el-select v-model="form.special_medical " style="width:160px;" placeholder="请选择">
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+
+            
+
            <el-form-item label="经销商 : " prop="manufacturer" style="width:100%">
              
                <el-select v-model="form.dealer" style="width:100%;" filterable placeholder="请选择">
@@ -259,6 +289,13 @@
           value: '2',
           label: '否'
         }],
+        optionsOne: [{
+          value: '1',
+          label: '国内'
+        }, {
+          value: '2',
+          label: '国外'
+        }],
         good_unit: '',
         isClose: false,
         good_status: [],
@@ -297,7 +334,10 @@
           is_statistics_work: '',
           sort: '',
           is_doctor_use: '',
-          good_number: ''
+          good_number: '',
+          social_security_directory_code:"",
+          production_type:"",
+          special_medical:"",
         },
 
         rules: {
@@ -324,8 +364,13 @@
             { required: true, message: '请输入零价', trigger: 'blur' }
           ], stock_warn_count: [
             { required: true, message: '请输入库存警戒', trigger: 'blur' }
+          ],social_security_directory_code:[
+            {required:true,message:"请填写社保目录编码",trigger:'blur'}
+          ],production_type:[
+            {required:true,message:"请填写生产地类别",trigger:"blur"}
+          ],special_medical:[
+            {required:true,message:"请填写特殊医院材料标志",trigger:"blur"}
           ]
-
         },
         dealer:[]
       }
@@ -422,7 +467,7 @@
         })
       },
       getValue: function() {
-        console.log("生产吃",this.form.manufacturer)
+        
         const form = {}
         form['specification_name'] = this.form.specification_name
         form['good_unit'] = this.form.good_unit
@@ -459,7 +504,9 @@
         form['agent'] = this.form.agent
         form['good_number'] = this.form.good_number
         form['good_status'] = this.good_status.join(',')
-
+        form['social_security_directory_code'] = this.form.social_security_directory_code
+        form['production_type'] = this.form.production_type
+        form['special_medical'] = this.form.special_medical
         return form
       }, changeSelected: function(val) {
         console.log(val)

src/xt_pages/stock/detail/stockInDetail.vue

@@ -723,36 +723,43 @@ export default {
         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

@@ -709,7 +709,10 @@ export default {
         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(){
 
@@ -723,6 +726,9 @@ export default {
         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

@@ -180,7 +180,7 @@
       <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"

src/xt_pages/workforce/remind_print.vue

@@ -59,8 +59,8 @@
                   {{modeOptions[main_collection.mode_id].name}}
                 </td>
                 <td :width="td_1_width">
-                  <span v-if="org_id!=9987">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
-                  {{main_collection.prescription.dialysis_dialyszers}} 
+                  <span v-if="org_id!=9987">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span>
+                  {{main_collection.prescription.dialysis_dialyszers}}
                   <span v-if="main_collection.prescription.dialysis_dialyszers!=''&& main_collection.prescription.dialysis_irrigation!='' ">/</span>
                   <span v-if="main_collection.prescription.dialysis_irrigation!=''">{{main_collection.prescription.dialysis_irrigation}}</span>
 
@@ -128,7 +128,7 @@
       this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
       this.week_type = this.$route.query.week_type
       this.week_time  = this.$route.query.week_time
-      
+
       const params = {
           week_type:this.week_type,
           week_time:this.week_time,
@@ -311,7 +311,7 @@
         }else{
           var str = year + "年" + month + "月" + day + "日  " + days;
           return str;
-        } 
+        }
       },
       compare(property) {
         return function (a, b) {
@@ -321,7 +321,7 @@
         }
       },
     }
-   
+
   }
 </script>