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

src/api/role/admin.js

@@ -26,13 +26,23 @@ export function getAddAdminInitData() {
   })
 }
 
-export function addAdmin(params) {
-  
-  console.log("epa",params)
-  
+export function addAdmin(mobile, name, type, title, role, intro, user_title_name,department,department_id) {
+  const params = {
+    mobile: mobile,
+    name: name,
+    type: type,
+    title: title,
+    role: role,
+    intro: intro,
+    user_title_name: user_title_name,
+    department:department,
+    department_id:department_id,
+  }
+  console.log("epa",department_id,department)
+
   return request({
     url: '/api/admin/add',
-    method: 'get',
+    method: 'post',
     params: params
   })
 }
@@ -48,14 +58,25 @@ export function getModifyAdminInitData(uid) {
   })
 }
 
-export function modifyAdmin(params) {
-  
-  
- 
- 
+export function modifyAdmin(uid, name, type, title, role, intro, user_title_name, sort,department,department_id) {
+  console.log("进来",department,department_id)
+  const params = {
+    uid: uid,
+    name: name,
+    type: type,
+    title: title,
+    role: role,
+    intro: intro,
+    user_title_name: user_title_name,
+    sort: sort,
+    department:department,
+    department_id:department_id
+  }
+
+
   return request({
     url: '/api/admin/edit',
-    method: 'get',
+    method: 'post',
     params: params
   })
 }
@@ -89,3 +110,4 @@ export function submitDialysisRecordPermissionUsers(ids_str) {
     params: params
   })
 }
+

src/router/modules/dialysis.js

@@ -292,6 +292,18 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/print/batch/seventeen',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_seventeen'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysis_batch_seventeen',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/print/batch/twenty',
       component: () =>

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,11 @@
         });
       },
       createData() {
+        
         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/dialysis/bloodPresssWatch.vue

@@ -160,6 +160,16 @@
           >批量打印</el-button
         >
       </template>
+      <template v-if="this.template_id == 17">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button
+        >
+      </template>
       <template v-if="this.template_id == 20">
         <el-button
           size="small"
@@ -801,6 +811,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/thirteen" });
       } else if (this.template_id == 15) {
         this.$router.push({ path: "/dialysis/print/batch/fifteen" });
+      } else if (this.template_id == 17) {
+        this.$router.push({ path: "/dialysis/print/batch/seventeen" });
       } else if (this.template_id == 20) {
         this.$router.push({ path: "/dialysis/print/batch/twenty" });
       } else if (this.template_id == 22) {