Merge branch 'dev' of http://172.16.100.139/new-business/drp-web into dev

src/views/business/spd/bo/gather/index.vue

@@ -84,6 +84,11 @@
           <span>{{ parseTime(scope.row.cooperationEnd, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="科室" align="center" prop="section" width="90">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.mk_bo_section" :value="scope.row.section" />
+        </template>
+      </el-table-column>
       <el-table-column label="科室关键人姓名" align="center" prop="sectionKeyPsnname" width="90" />
       <el-table-column label="科室关键人联系电话" align="center" prop="sectionKeyPsnphone" width="120" />
       <el-table-column label="院级关键人姓名" align="center" prop="hospitalKeyPsnname" width="90" />
@@ -172,6 +177,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
+            <el-form-item label="科室" prop="section">
+              <el-select v-model.trim="form.section" placeholder="请选择科室" clearable filterable>
+                <el-option v-for="dict in dict.type.mk_bo_section" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="科室关键人姓名" prop="sectionKeyPsnname" label-width="110px">
               <el-input v-model="form.sectionKeyPsnname" placeholder="请输入科室关键人姓名" />
             </el-form-item>
@@ -181,13 +194,13 @@
               <el-input v-model="form.sectionKeyPsnphone" placeholder="请输入科室关键人联系电话" />
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="院级关键人姓名" prop="hospitalKeyPsnname" label-width="110px">
               <el-input v-model="form.hospitalKeyPsnname" placeholder="请输入院级关键人姓名" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="院级关键人联系电话" prop="hospitalKeyPsnphone" label-width="140px">
               <el-input v-model="form.hospitalKeyPsnphone" placeholder="请输入院级关键人联系电话" />
@@ -240,6 +253,7 @@
       ElPopoverTreeSelect: () =>
         import("@/components/popover-tree-select/index.vue"),
     },
+    dicts: ['mk_bo_section'],
     data() {
       return {
         // 遮罩层
@@ -274,6 +288,7 @@
           brandPortion: null,
           cooperationStart: null,
           cooperationEnd: null,
+          section: null,
           sectionKeyPsnname: null,
           sectionKeyPsnphone: null,
           hospitalKeyPsnname: null,
@@ -306,6 +321,11 @@
             message: '供应商名称不能为空',
             trigger: 'blur'
           }],
+          section: [{
+            required: true,
+            message: '科室不能为空',
+            trigger: 'blur'
+          }],
         },
         // 页面状态
         pageState: null,
@@ -345,6 +365,7 @@
           brandPortion: null,
           cooperationStart: null,
           cooperationEnd: null,
+          section: null,
           sectionKeyPsnname: null,
           sectionKeyPsnphone: null,
           hospitalKeyPsnname: null,
@@ -393,6 +414,7 @@
           brandPortion: null,
           cooperationStart: null,
           cooperationEnd: null,
+          section: null,
           sectionKeyPsnname: null,
           sectionKeyPsnphone: null,
           hospitalKeyPsnname: null,

src/views/purchase/transferOrder/bipPull/index.vue

@@ -13,6 +13,8 @@
 
         <el-row class="my-4" style="text-align: right">
           <el-button-group style="margin-right: 5px">
+            <el-button type="primary" :size="size" @click="back"
+              >返回</el-button>
             <el-button type="primary" :size="size" @click="verify"
               >确认</el-button
             >
@@ -193,11 +195,17 @@ export default {
         this.$modal.msgWarning("请选择一条数据！");
       }
     },
-    doubleClick(row) {
-      this.isList = false;
-      this.page = "check";
-      this.rowDetail = row;
-      this.disable = true;
+    //返回
+    back(){
+      var userAgent = navigator.userAgent;
+      if (userAgent.indexOf("Firefox") != -1 || userAgent.indexOf("Chrome") !=-1) {
+        window.location.href="about:blank";
+        window.close();
+      } else {
+        window.opener = null;
+        window.open("", "_self");
+        window.close();
+      }
     },
     // 选中某行
     select(row) {