模板修改 资质页面修改

src/api/mainrTenance-sup/index.js

@@ -33,4 +33,12 @@ export function updateBoneTemplate(data) {
         method:"post",
         data
     })
-}
+}
+// 适用科室下拉框
+export function selectDeptList(data) {
+    return request({
+        url:"/web/delvOrd/selectDeptList",
+        method:"post",
+        data
+    })
+}

src/api/orderManage-sup/index.js

@@ -101,9 +101,9 @@ export function getMcsPurcOrdMx(data) {
 }
         
 // 订单复用 delvOrdId
-export function delvOrdId(data) {
+export function selectDelvOrdCopy(data) {
     return request({
-        url:"/web/purcOrd/delvOrdId",
+        url:"/web/delvOrd/selectDelvOrdCopy",
         method:"post",
         data
     })

src/views/page/consumCataManage-sup/catalogdetails.vue

@@ -1,397 +1,518 @@
 <template>
   <div>
-    <el-form :model="infoData" ref="planForm" label-width="150px" class="grid-form-class">
-      <div class="common-card" v-if="reaDiv">
-        <!-- <h3>审批状态</h3> -->
-        <!-- <yl-step></yl-step> -->
-        <div class="form-body">
-          <div class="flex-css">
-            <el-form-item label="驳回原因" prop="rejtRea">
-              <el-input v-model="infoData.rejtRea"></el-input>
-            </el-form-item>
-          </div>
-        </div>
-      </div>
-      <div class="common-card">
-        <h3>商品基本资料</h3>
-        <!-- <div class="right-type" style="color: #3c64dc; font-weight: 800">
-          {{ $store.state.user.username }}
-        </div> -->
-        <div class="form-body">
-          <div class="flex-css">
-            <el-form-item label="耗材名称" prop="prodName">
-              <div class="content" v-if="isShow">
-                {{ infoData.prodName }}
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="基础信息" name="first">
+        <el-form
+          :model="infoData"
+          ref="planForm"
+          label-width="150px"
+          class="grid-form-class"
+        >
+          <!-- <div class="common-card" v-if="reaDiv">
+            <div class="form-body">
+              <div class="flex-css">
+                <el-form-item label="驳回原因" prop="rejtRea">
+                  <el-input v-model="infoData.rejtRea"></el-input>
+                </el-form-item>
               </div>
-              <el-input
-                v-else
-                v-model="infoData.prodName"
-                placeholder="请输入耗材名称"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="通用名称" prop="genName" :rules="rules.required">
-              <el-input
-                v-model="infoData.genName"
-                placeholder="请输入通用名称"
-                maxlength="50"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="英文名称" prop="engName" :rules="rules.InterEng">
-              <el-input
-                v-model="infoData.engName"
-                placeholder="请输入英文名称"
-                maxlength="50"
-              ></el-input>
-            </el-form-item>
-          </div>
-          <div class="flex-css">
-            <el-form-item label="品牌" prop="brad">
-              <el-input
-                v-model="infoData.brad"
-                maxlength="50"
-                placeholder="请输入品牌"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="生产来源" prop="prodSouc" :rules="rules.selectRequired">
-              <el-select
-                v-model="infoData.prodSouc"
-                placeholder="请选择生产来源"
-                clearable
-              >
-                <el-option
-                  v-for="item in sourceData"
-                  :key="item.value"
-                  :label="item.name"
-                  :value="item.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="生产企业" prop="prodEntp">
-              <div class="content" v-if="isShow">
-                {{ infoData.prodEntp }}
-              </div>
-              <el-input
-                v-else
-                v-model="infoData.prodEntp"
-                placeholder="请输入生产企业"
-              ></el-input>
-            </el-form-item>
-          </div>
-          <div class="flex-css">
-            <el-form-item label="代理企业" prop="agnt">
-              <div class="content" v-if="isShow">
-                {{ infoData.agnt }}
+            </div>
+          </div> -->
+          <div class="common-card">
+            <h3>商品基本资料</h3>
+            <!-- <div class="right-type" style="color: #3c64dc; font-weight: 800">
+              {{ $store.state.user.username }}
+            </div> -->
+            <div class="form-body">
+              <div class="flex-css">
+                <el-form-item label="耗材名称" prop="prodName">
+                  <div class="content" v-if="isShow">
+                    {{ infoData.prodName }}
+                  </div>
+                  <el-input
+                    v-else
+                    v-model="infoData.prodName"
+                    placeholder="请输入耗材名称"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="通用名称" prop="genName" :rules="rules.required">
+                  <el-input
+                    v-model="infoData.genName"
+                    placeholder="请输入通用名称"
+                    maxlength="50"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="英文名称" prop="engName" :rules="rules.InterEng">
+                  <el-input
+                    v-model="infoData.engName"
+                    placeholder="请输入英文名称"
+                    maxlength="50"
+                  ></el-input>
+                </el-form-item>
               </div>
-              <el-input
-                v-else
-                v-model="infoData.agnt"
-                placeholder="请输入代理企业"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="挂网价格" prop="pubonlnPric">
-              <div class="content" v-if="isShow">
-                {{ infoData.pubonlnPric }}
+              <div class="flex-css">
+                <el-form-item label="品牌" prop="brad">
+                  <el-input
+                    v-model="infoData.brad"
+                    maxlength="50"
+                    placeholder="请输入品牌"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item
+                  label="生产来源"
+                  prop="prodSouc"
+                  :rules="rules.selectRequired"
+                >
+                  <el-select
+                    v-model="infoData.prodSouc"
+                    placeholder="请选择生产来源"
+                    clearable
+                  >
+                    <el-option
+                      v-for="item in sourceData"
+                      :key="item.value"
+                      :label="item.name"
+                      :value="item.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="生产企业" prop="prodEntp">
+                  <div class="content" v-if="isShow">
+                    {{ infoData.prodEntp }}
+                  </div>
+                  <el-input
+                    v-else
+                    v-model="infoData.prodEntp"
+                    placeholder="请输入生产企业"
+                  ></el-input>
+                </el-form-item>
               </div>
-              <el-input
-                v-else
-                v-model="infoData.pubonlnPric"
-                placeholder="请输入挂网价格"
-              ></el-input>
-            </el-form-item>
+              <div class="flex-css">
+                <el-form-item label="代理企业" prop="agnt">
+                  <div class="content" v-if="isShow">
+                    {{ infoData.agnt }}
+                  </div>
+                  <el-input
+                    v-else
+                    v-model="infoData.agnt"
+                    placeholder="请输入代理企业"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="挂网价格" prop="pubonlnPric">
+                  <div class="content" v-if="isShow">
+                    {{ infoData.pubonlnPric }}
+                  </div>
+                  <el-input
+                    v-else
+                    v-model="infoData.pubonlnPric"
+                    placeholder="请输入挂网价格"
+                  ></el-input>
+                </el-form-item>
 
-            <el-form-item label="规格" prop="spec">
-              <div class="content" v-if="isShow">
-                {{ infoData.spec }}
+                <el-form-item label="规格" prop="spec">
+                  <div class="content" v-if="isShow">
+                    {{ infoData.spec }}
+                  </div>
+                  <el-input
+                    v-else
+                    v-model="infoData.spec"
+                    placeholder="请输入规格"
+                  ></el-input>
+                </el-form-item>
               </div>
-              <el-input
-                v-else
-                v-model="infoData.spec"
-                placeholder="请输入规格"
-              ></el-input>
-            </el-form-item>
-          </div>
-          <div class="flex-css">
-            <el-form-item label="型号" prop="mol">
-              <div class="content" v-if="isShow">
-                {{ infoData.mol }}
-              </div>
-              <el-input v-else v-model="infoData.mol" placeholder="请输入型号"></el-input>
-            </el-form-item>
-            <el-form-item label="材质" prop="matl">
-              <div class="content" v-if="isShow">
-                {{ infoData.matl }}
+              <div class="flex-css">
+                <el-form-item label="型号" prop="mol">
+                  <div class="content" v-if="isShow">
+                    {{ infoData.mol }}
+                  </div>
+                  <el-input
+                    v-else
+                    v-model="infoData.mol"
+                    placeholder="请输入型号"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="材质" prop="matl">
+                  <div class="content" v-if="isShow">
+                    {{ infoData.matl }}
+                  </div>
+                  <el-input
+                    v-else
+                    v-model="infoData.matl"
+                    placeholder="请输入材质"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="包装材质" prop="pacmatl">
+                  <div class="content" v-if="isShow">
+                    {{ infoData.pacmatl }}
+                  </div>
+                  <el-input
+                    v-else
+                    v-model="infoData.pacmatl"
+                    placeholder="请输入包装材质"
+                  ></el-input>
+                </el-form-item>
               </div>
-              <el-input
-                v-else
-                v-model="infoData.matl"
-                placeholder="请输入材质"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="包装材质" prop="pacmatl">
-              <div class="content" v-if="isShow">
-                {{ infoData.pacmatl }}
+              <div class="flex-css">
+                <el-form-item label="注册证号" prop="regcertno">
+                  <div class="content" v-if="isShow">
+                    {{ infoData.regcertno }}
+                  </div>
+                  <el-input
+                    v-else
+                    v-model="infoData.regcertno"
+                    placeholder="请输入注册证号"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="目录来源" prop="isPub">
+                  <!-- <el-select
+                    v-model="infoData.isPub"
+                    placeholder="请选择目录来源"
+                    clearable
+                    disabled
+                  >
+                    <el-option
+                      v-for="item in isPubData"
+                      :key="item.value"
+                      :label="item.name"
+                      :value="item.value"
+                    ></el-option>
+                  </el-select> -->
+                  <div class="content">
+                    <span v-if="infoData.isPub == '1'">挂网</span>
+                    <span v-if="infoData.isPub == '0'">非挂网</span>
+                  </div>
+                </el-form-item>
+                <el-form-item label="  " prop="regcertno">
+                  <div class="content" v-if="isShow">
+                    <!-- {{infoData.regcertno}} -->
+                  </div>
+                </el-form-item>
               </div>
-              <el-input
-                v-else
-                v-model="infoData.pacmatl"
-                placeholder="请输入包装材质"
-              ></el-input>
-            </el-form-item>
+            </div>
           </div>
-          <div class="flex-css">
-            <el-form-item label="注册证号" prop="regcertno">
-              <div class="content" v-if="isShow">
-                {{ infoData.regcertno }}
-              </div>
-              <el-input
-                v-else
-                v-model="infoData.regcertno"
-                placeholder="请输入注册证号"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="目录来源" prop="isPub">
-              <!-- <el-select
-                v-model="infoData.isPub"
-                placeholder="请选择目录来源"
-                clearable
-                disabled
-              >
-                <el-option
-                  v-for="item in isPubData"
-                  :key="item.value"
-                  :label="item.name"
-                  :value="item.value"
-                ></el-option>
-              </el-select> -->
-              <div class="content">
-                <span v-if="infoData.isPub == '1'">挂网</span>
-                <span v-if="infoData.isPub == '0'">非挂网</span>
+          <div class="common-card">
+            <h3>商品属性资料</h3>
+            <div class="form-body">
+              <div class="flex-css">
+                <!-- <el-form-item label="商品大类" prop="prodType" :rules="rules.required">
+                  <el-select v-model="infoData.prodType" placeholder="请选择商品大类" clearable>
+                    <el-option
+                      v-for="item in prodTypeData"
+                      :key="item.value"
+                      :label="item.name"
+                      :value="item.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item> -->
+                <el-form-item
+                  label="耗材类别"
+                  prop="mcsType"
+                  :rules="rules.selectRequired"
+                >
+                  <el-select
+                    v-model="infoData.mcsType"
+                    placeholder="请选择耗材类别"
+                    clearable
+                  >
+                    <el-option
+                      v-for="item in mcsTypeData"
+                      :key="item.value"
+                      :label="item.name"
+                      :value="item.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="是否集采" prop="isFas">
+                  <div class="content" v-if="isShow">
+                    <span v-if="infoData.isFas == '1'">是</span>
+                    <span v-if="infoData.isFas == '0'">否</span>
+                  </div>
+                  <el-select
+                    v-else
+                    v-model="infoData.isFas"
+                    placeholder="请选择是否集采"
+                    clearable
+                    @change="clearType"
+                  >
+                    <el-option
+                      v-for="item in iFjcData"
+                      :key="item.value"
+                      :label="item.name"
+                      :value="item.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
               </div>
-            </el-form-item>
-            <el-form-item label="  " prop="regcertno">
-              <div class="content" v-if="isShow">
-                <!-- {{infoData.regcertno}} -->
+              <div class="flex-css">
+                <el-form-item
+                  label="带量批次"
+                  prop="fasBtch"
+                  v-if="infoData.isFas == '1'"
+                >
+                  <div class="content" v-if="isShow">
+                    {{ infoData.fasBtch }}
+                  </div>
+                  <el-input
+                    v-else
+                    v-model="infoData.fasBtch"
+                    placeholder="请输入带量批次"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item
+                  label="是否寄售"
+                  prop="isCgmt"
+                  :rules="rules.selectRequired"
+                >
+                  <el-select
+                    v-model="infoData.isCgmt"
+                    placeholder="请选择是否寄售"
+                    clearable
+                  >
+                    <el-option
+                      v-for="item in iFjcData"
+                      :key="item.value"
+                      :label="item.name"
+                      :value="item.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+                <!-- <el-form-item label="是否十八项重点耗材" prop="isEm" :rules="rules.selectRequired">
+                  <el-select v-model="infoData.isEm" placeholder="请选择是否十八项重点耗材" clearable>
+                    <el-option
+                      v-for="item in iFjcData"
+                      :key="item.value"
+                      :label="item.name"
+                      :value="item.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item> -->
               </div>
-            </el-form-item>
+            </div>
           </div>
-        </div>
-      </div>
-      <div class="common-card">
-        <h3>商品属性资料</h3>
-        <div class="form-body">
-          <div class="flex-css">
-            <!-- <el-form-item label="商品大类" prop="prodType" :rules="rules.required">
-              <el-select v-model="infoData.prodType" placeholder="请选择商品大类" clearable>
-                <el-option
-                  v-for="item in prodTypeData"
-                  :key="item.value"
-                  :label="item.name"
-                  :value="item.value"
-                ></el-option>
-              </el-select>
-            </el-form-item> -->
-            <el-form-item label="耗材类别" prop="mcsType" :rules="rules.selectRequired">
-              <el-select
-                v-model="infoData.mcsType"
-                placeholder="请选择耗材类别"
-                clearable
-              >
-                <el-option
-                  v-for="item in mcsTypeData"
-                  :key="item.value"
-                  :label="item.name"
-                  :value="item.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="是否集采" prop="isFas">
-              <div class="content" v-if="isShow">
-                <span v-if="infoData.isFas == '1'">是</span>
-                <span v-if="infoData.isFas == '0'">否</span>
+          <div class="common-card">
+            <h3>耗材编码资料</h3>
+            <div class="form-body">
+              <div class="flex-css">
+                <el-form-item label="医保编码" prop="hiCode">
+                  <div class="content" v-if="isShow">
+                    {{ infoData.hiCode }}
+                  </div>
+                  <el-input
+                    v-else
+                    v-model="infoData.hiCode"
+                    placeholder="请输入医保编码"
+                  ></el-input>
+                </el-form-item>
               </div>
-              <el-select
-                v-else
-                v-model="infoData.isFas"
-                placeholder="请选择是否集采"
-                clearable
-                @change="clearType"
-              >
-                <el-option
-                  v-for="item in iFjcData"
-                  :key="item.value"
-                  :label="item.name"
-                  :value="item.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
+            </div>
           </div>
-          <div class="flex-css">
-            <el-form-item label="带量批次" prop="fasBtch" v-if="infoData.isFas == '1'">
-              <div class="content" v-if="isShow">
-                {{ infoData.fasBtch }}
+          <div class="common-card">
+            <h3>商品包装资料</h3>
+            <div class="form-body">
+              <div class="flex-css">
+                <el-form-item
+                  label="最小单位"
+                  prop="prcUnt"
+                  :rules="rules.selectRequired"
+                >
+                  <el-select
+                    v-model="infoData.prcUnt"
+                    placeholder="请选择最小单位"
+                    clearable
+                  >
+                    <el-option
+                      v-for="item in purcUntData"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.label"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="采购价" prop="purcPric" :rules="rules.numPot4">
+                  <el-input
+                    maxlength="50"
+                    v-model="infoData.purcPric"
+                    placeholder="请输入采购价"
+                  ></el-input>
+                </el-form-item>
+              </div>
+              <div class="flex-css">
+                <el-form-item
+                  label="采购单位"
+                  prop="purcUnt"
+                  :rules="rules.selectRequired"
+                >
+                  <el-select
+                    v-model="infoData.purcUnt"
+                    placeholder="请选择采购单位"
+                    clearable
+                  >
+                    <el-option
+                      v-for="item in prcUntData"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.label"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="包装内数量" prop="convrat" :rules="rules.InterNum">
+                  <template slot-scope="{}" slot="label">
+                    <span>包装内数量</span>
+                    <el-tooltip class="item" effect="dark" placement="top">
+                      <i
+                        class="el-icon-question"
+                        style="font-size: 14px; vertical-align: middle"
+                      ></i>
+                      <div slot="content">包含最小单位的数量</div>
+                    </el-tooltip>
+                  </template>
+                  <template>
+                    <el-input
+                      v-model="infoData.convrat"
+                      placeholder="请输入包装内数量"
+                      maxlength="50"
+                    ></el-input>
+                  </template>
+                </el-form-item>
               </div>
-              <el-input
-                v-else
-                v-model="infoData.fasBtch"
-                placeholder="请输入带量批次"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="是否寄售" prop="isCgmt" :rules="rules.selectRequired">
-              <el-select v-model="infoData.isCgmt" placeholder="请选择是否寄售" clearable>
-                <el-option
-                  v-for="item in iFjcData"
-                  :key="item.value"
-                  :label="item.name"
-                  :value="item.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <!-- <el-form-item label="是否十八项重点耗材" prop="isEm" :rules="rules.selectRequired">
-              <el-select v-model="infoData.isEm" placeholder="请选择是否十八项重点耗材" clearable>
-                <el-option
-                  v-for="item in iFjcData"
-                  :key="item.value"
-                  :label="item.name"
-                  :value="item.value"
-                ></el-option>
-              </el-select>
-            </el-form-item> -->
+            </div>
           </div>
-        </div>
-      </div>
-      <div class="common-card">
-        <h3>耗材编码资料</h3>
-        <div class="form-body">
-          <div class="flex-css">
-            <el-form-item label="医保编码" prop="hiCode">
-              <div class="content" v-if="isShow">
-                {{ infoData.hiCode }}
+          <div class="common-card">
+            <h3>其他资料</h3>
+            <div class="form-body">
+              <div class="flex-css">
+                <el-form-item
+                  label="存储方式"
+                  prop="stogType"
+                  :rules="rules.selectRequired"
+                >
+                  <el-select
+                    v-model="infoData.stogType"
+                    placeholder="请选择存储方式"
+                    clearable
+                  >
+                    <el-option
+                      v-for="item in stogTypeData"
+                      :key="item.value"
+                      :label="item.name"
+                      :value="item.name"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item
+                  label="存储温度"
+                  prop="stogTemp"
+                  :rules="rules.selectRequired"
+                >
+                  <el-select
+                    v-model="infoData.stogTemp"
+                    placeholder="请选择存储温度"
+                    clearable
+                  >
+                    <el-option
+                      v-for="item in stogTempData"
+                      :key="item.value"
+                      :label="item.name"
+                      :value="item.name"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item
+                  label="是否灭菌"
+                  prop="isStlz"
+                  :rules="rules.selectRequired"
+                >
+                  <el-select
+                    v-model="infoData.isStlz"
+                    placeholder="请选择是否灭菌"
+                    clearable
+                  >
+                    <el-option
+                      v-for="item in isStlzdata"
+                      :key="item.value"
+                      :label="item.name"
+                      :value="item.name"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
               </div>
-              <el-input
-                v-else
-                v-model="infoData.hiCode"
-                placeholder="请输入医保编码"
-              ></el-input>
-            </el-form-item>
+            </div>
           </div>
+        </el-form>
+        <div class="foot-button">
+          <el-button v-if="btnShow" type="success" @click="handleSave" :loading="saveLoad"
+            >保存</el-button
+          >
+          <el-button
+            v-if="btnShow"
+            type="primary"
+            @click="handleSubmit"
+            :loading="submitLoad"
+            >提交</el-button
+          >
+          <!-- </div>
+        <div class="foot-button"> -->
+          <el-button type="danger" @click="handleBack">返回</el-button>
         </div>
-      </div>
-      <div class="common-card">
-        <h3>商品包装资料</h3>
-        <div class="form-body">
-          <div class="flex-css">
-            <el-form-item label="最小单位" prop="prcUnt" :rules="rules.selectRequired">
-              <el-select v-model="infoData.prcUnt" placeholder="请选择最小单位" clearable>
-                <el-option
-                  v-for="item in purcUntData"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.label"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="采购价" prop="purcPric" :rules="rules.numPot4">
-              <el-input
-                maxlength="50"
-                v-model="infoData.purcPric"
-                placeholder="请输入采购价"
-              ></el-input>
-            </el-form-item>
-          </div>
-          <div class="flex-css">
-            <el-form-item label="采购单位" prop="purcUnt" :rules="rules.selectRequired">
-              <el-select
-                v-model="infoData.purcUnt"
-                placeholder="请选择采购单位"
-                clearable
-              >
-                <el-option
-                  v-for="item in prcUntData"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.label"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="包装内数量" prop="convrat" :rules="rules.InterNum">
-              <template slot-scope="{}" slot="label">
-                <span>包装内数量</span>
-                <el-tooltip class="item" effect="dark" placement="top">
-                  <i
-                    class="el-icon-question"
-                    style="font-size: 14px; vertical-align: middle"
-                  ></i>
-                  <div slot="content">包含最小单位的数量</div>
-                </el-tooltip>
-              </template>
-              <template>
-                <el-input
-                  v-model="infoData.convrat"
-                  placeholder="请输入包装内数量"
-                  maxlength="50"
-                ></el-input>
+      </el-tab-pane>
+      <el-tab-pane label="资质信息" name="second">
+        <div class="common-card">
+          <h3>商品资质</h3>
+          <el-table
+            v-loading="listLoading"
+            element-loading-text="加载中"
+            :data="list"
+            fit
+            stripe
+            border
+          >
+            <template slot="empty">
+              <img src="@/assets/nopage.png" alt />
+              <p>暂无数据</p>
+            </template>
+            <el-table-column fixed type="index" label="序号" width="60" />
+            <el-table-column label="资质证书信息"> </el-table-column>
+            <el-table-column label="资质证书编号" prop="hiCode" />
+            <el-table-column label="发证日期" prop="spec" />
+            <el-table-column label="截止日期" prop="mol" />
+            <el-table-column label="资质证件" prop="isFas">
+              <template #default="{ row }">
+                <span v-if="row.isFas == '0'">否</span>
+                <span v-if="row.isFas == '1'">是</span>
               </template>
-            </el-form-item>
-          </div>
+            </el-table-column>
+            <el-table-column label="备注" prop="purcUnt" />
+          </el-table>
         </div>
-      </div>
-      <div class="common-card">
-        <h3>其他资料</h3>
-        <div class="form-body">
-          <div class="flex-css">
-            <el-form-item label="存储方式" prop="stogType" :rules="rules.selectRequired">
-              <el-select
-                v-model="infoData.stogType"
-                placeholder="请选择存储方式"
-                clearable
-              >
-                <el-option
-                  v-for="item in stogTypeData"
-                  :key="item.value"
-                  :label="item.name"
-                  :value="item.name"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="存储温度" prop="stogTemp" :rules="rules.selectRequired">
-              <el-select
-                v-model="infoData.stogTemp"
-                placeholder="请选择存储温度"
-                clearable
-              >
-                <el-option
-                  v-for="item in stogTempData"
-                  :key="item.value"
-                  :label="item.name"
-                  :value="item.name"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="是否灭菌" prop="isStlz" :rules="rules.selectRequired">
-              <el-select v-model="infoData.isStlz" placeholder="请选择是否灭菌" clearable>
-                <el-option
-                  v-for="item in isStlzdata"
-                  :key="item.value"
-                  :label="item.name"
-                  :value="item.name"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </div>
+        <div class="common-card">
+          <h3>生产厂商资质</h3>
+          <el-table
+            v-loading="listLoading"
+            element-loading-text="加载中"
+            :data="list"
+            fit
+            stripe
+            border
+          >
+            <template slot="empty">
+              <img src="@/assets/nopage.png" alt />
+              <p>暂无数据</p>
+            </template>
+            <el-table-column fixed type="index" label="序号" width="60" />
+            <el-table-column label="资质证书信息"> </el-table-column>
+            <el-table-column label="资质证书编号" prop="hiCode" />
+            <el-table-column label="发证日期" prop="spec" />
+            <el-table-column label="截止日期" prop="mol" />
+            <el-table-column label="资质证件" prop="isFas">
+              <template #default="{ row }">
+                <span v-if="row.isFas == '0'">否</span>
+                <span v-if="row.isFas == '1'">是</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" prop="purcUnt" />
+          </el-table>
         </div>
-      </div>
-    </el-form>
-    <div class="foot-button">
-      <el-button v-if="btnShow" type="success" @click="handleSave" :loading="saveLoad"
-        >保存</el-button
-      >
-      <el-button v-if="btnShow" type="primary" @click="handleSubmit" :loading="submitLoad"
-        >提交</el-button
-      >
-      <!-- </div>
-    <div class="foot-button"> -->
-      <el-button type="danger" @click="handleBack">返回</el-button>
-    </div>
+      </el-tab-pane>
+    </el-tabs>
   </div>
 </template>
 
@@ -408,6 +529,7 @@ export default {
   components: { ylUpload, ylStep },
   data() {
     return {
+      activeName: "first",
       saveLoad: false,
       submitLoad: false,
       rules,
@@ -614,7 +736,13 @@ export default {
       // }
       // });
     },
-
+    handleClick(tab) {
+      // if (tab.name == "first") {
+      //   this.getorderData();
+      // } else {
+      //   this.getorderDataC();
+      // }
+    },
     // 整体提交
     handleSubmit() {
       this.$refs["planForm"].validate((valid) => {

src/views/page/consumCataManage-sup/catalogdetailsadd.vue

@@ -468,7 +468,6 @@ export default {
         { value: "束", label: "束" },
       ],
       btnShow: true,
-      reaDiv: false,
     };
   },
   created() {

src/views/page/mainrTenance-sup/templateDetail/Surgicalbag.vue

@@ -39,9 +39,9 @@
           <el-select v-model="listQuery.dept" placeholder="请选择适用科室" clearable>
             <el-option
               v-for="item in deptOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              :key="item.id"
+              :label="item.deptName"
+              :value="item.id"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -83,7 +83,11 @@
         <el-table-column label="模板名称" prop="tmplName" />
         <!-- <el-table-column label="模板类型" prop="detlCnt" /> -->
         <el-table-column label="适用手术" prop="oprn" />
-        <el-table-column label="适用科室" prop="dept" />
+        <el-table-column label="适用科室" prop="dept">
+          <!-- <template #default="{ row }">
+            <span v-for="item in deptOptions" :key="item.id">{{item.deptName}} </span>
+          </template> -->
+        </el-table-column>
         <el-table-column label="供应商" prop="crteUsrName" />
         <el-table-column label="制作人" prop="crteUsrName" />
         <el-table-column label="制作时间" prop="crteTime" />
@@ -108,9 +112,8 @@
 
 <script>
 import ylPagination from "@/components/yl-pagination";
-import { selectRetnOrdD } from "@/api/productreturnmanage-sup/returnList";
 import { selectSpdList } from "@/api/orderManage-sup/index";
-import { getBoneTemplatePage,updateBoneTemplate } from "@/api/mainrTenance-sup/index"
+import { getBoneTemplatePage,updateBoneTemplate,selectDeptList  } from "@/api/mainrTenance-sup/index"
 export default {
   components: {
     ylPagination,
@@ -148,8 +151,6 @@ export default {
         {value:"2",label:"222"},
       ],
       deptOptions:[
-        {value:"1",label:"111"},
-        {value:"2",label:"222"},
       ],
     };
   },
@@ -157,17 +158,22 @@ export default {
     this.getData();
     if (this.$route.query.spdId) {
       this.listQuery.spdId = this.$route.query.spdId;
-      getBoneTemplatePage(this.listQuery)
-        .then((res) => {
-          this.list = res.data.records;
-          this.total = res.data.total;
-          this.listLoading = false;
-          this.btnShow = true
-        })
-        .catch((err) => {
-          this.listLoading = false;
-        });
+      this.getorderData()
+      this.btnShow = true
+
+      // getBoneTemplatePage(this.listQuery)
+      //   .then((res) => {
+      //     this.list = res.data.records;
+      //     this.total = res.data.total;
+      //     this.listLoading = false;
+      //   })
+      //   .catch((err) => {
+      //     this.listLoading = false;
+      //   });
     }
+    selectDeptList({deptName:""}).then((res)=>{
+      this.deptOptions = res.data
+    })
   },
   methods: {
     tabClick(tab) {
@@ -191,6 +197,13 @@ export default {
           this.total = res.data.total;
           this.listLoading = false;
           this.btnShow = true;
+          this.list.forEach((v)=>{
+            this.deptOptions.forEach((i)=>{
+              if(v.dept==i.id){
+                v.dept = i.deptName
+              }
+            })
+          })
         })
         .catch((err) => {
           this.listLoading = false;
@@ -219,6 +232,13 @@ export default {
           this.list = res.data.records;
           this.total = res.data.total;
           this.listLoading = false;
+          this.list.forEach((v)=>{
+            this.deptOptions.forEach((i)=>{
+              if(v.dept==i.id){
+                v.dept = i.deptName
+              }
+            })
+          })
         })
         .catch((err) => {
           this.listLoading = false;
@@ -251,7 +271,6 @@ export default {
           name: "indexDetail",
           query: {
             spdId: this.spdId,
-            // spdId: this.$route.query.spdId,
           },
         });
     },

src/views/page/mainrTenance-sup/templateDetail/editbag.vue

@@ -21,9 +21,9 @@
               <el-select v-model="listForm.dept" placeholder="请选择适用科室" clearable>
                 <el-option
                   v-for="item in deptOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.label"
+                  :key="item.id"
+                  :label="item.deptName"
+                  :value="item.id"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -122,6 +122,13 @@
               >
             </template>
           </el-table-column>
+          <el-table-column label="操作">
+            <template slot-scope="scope">
+              <el-button type="text" style="color: red" @click="handleDel(scope.row)"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
         </el-table>
       </el-form>
     </div>
@@ -268,7 +275,7 @@
 import ylStep from "@/components/yl-step";
 import ylPagination from "@/components/yl-pagination";
 import mcsInfo from "@/views/components/mcs-info.vue";
-import { getBoneTemplateDetlList, saveBoneTemplate } from "@/api/mainrTenance-sup/index";
+import { getBoneTemplateDetlList, saveBoneTemplate ,selectDeptList} from "@/api/mainrTenance-sup/index";
 import { selectSplerMcsList } from "@/api/consumCataManage-sup/index";
 import rules from "@/utils/rules";
 export default {
@@ -284,10 +291,6 @@ export default {
         {value:"1",label:"111"},
         {value:"2",label:"222"},
       ],
-      deptOptions:[
-        {value:"1",label:"111"},
-        {value:"2",label:"222"},
-      ],
       listForm: {
         tmplName: "",
         oprn: "",
@@ -325,10 +328,7 @@ export default {
         {value:"1",label:"111"},
         {value:"2",label:"222"},
       ],
-      deptOptions:[
-        {value:"1",label:"111"},
-        {value:"2",label:"222"},
-      ],
+      deptOptions:[],
       isFasOptions: [
         { value: "1", label: "是" },
         { value: "0", label: "否" },
@@ -342,6 +342,7 @@ export default {
         { value: "1", label: "国产" },
         { value: "2", label: "进口" },
       ],
+      list1:[]
     };
   },
   created() {
@@ -358,6 +359,9 @@ export default {
   },
   mounted() {
     this.getData();
+    selectDeptList({deptName:""}).then((res)=>{
+      this.deptOptions = res.data
+    })
   },
   methods: {
     getData() {
@@ -434,6 +438,7 @@ export default {
       this.dialogLoading = true;
       this.listQuery.current = "1";
       this.getdiaMcs()
+      this.$refs.multipleTable.clearSelection()
     },
     getdiaMcs() {
       this.dialogLoading = true;
@@ -442,14 +447,14 @@ export default {
           this.mcsData = res.data.records;
           this.totalD = res.data.total;
           this.dialogLoading = false;
-          this.mcsData.forEach((row)=>{
-            this.list.forEach((el) => {
-              if(row.hiCode==el.hiCode){
-                console.log(el,"eee")
-                this.$refs.multipleTable.toggleRowSelection(row,true); 
-              }
-          })
-        })        
+        //   this.mcsData.forEach((row)=>{
+        //     this.list.forEach((el) => {
+        //       if(row.hiCode==el.hiCode){
+        //         console.log(el,"eee")
+        //         this.$refs.multipleTable.toggleRowSelection(row,true); 
+        //       }
+        //   })
+        // })        
         })
         .catch((err) => {
           this.dialogLoading = false;
@@ -466,13 +471,28 @@ export default {
     //确认
     clickMcs() {
       this.mcsDialog = false;
-      this.list = this.dialogSelect;
-      // this.$refs.multipleTable.clearSelection()
+      this.list = this.list.concat(this.dialogSelect);
+      console.log(this.list1,"1111")
+      // this.list = this.dialogSelect;
+      // console.log(this.dialogSelect,"dialogSelect")
+      this.$refs.multipleTable.clearSelection()
     },
     // 删除
     handleDel(row, indexed) {
       this.list = this.list.filter((item) => item.hiCode !== row.hiCode);
     },
+    // 禁选
+    selected(row, index) {
+      if (
+        this.list.some((el) => {
+          return el.hiCode === row.hiCode;
+        })
+      ) {
+        return false;
+      } else {
+        return true;
+      }
+    },
   },
 };
 </script>

src/views/page/mainrTenance-sup/templateDetail/indexDetail.vue

@@ -21,9 +21,9 @@
               <el-select v-else v-model="listForm.dept" placeholder="请选择适用科室" clearable>
                 <el-option
                   v-for="item in deptOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.label"
+                  :key="item.id"
+                  :label="item.deptName"
+                  :value="item.id"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -275,10 +275,9 @@
 import ylStep from "@/components/yl-step";
 import ylPagination from "@/components/yl-pagination";
 import mcsInfo from "@/views/components/mcs-info.vue";
-import { selectRetnDetl, acpRetnOrd } from "@/api/productreturnmanage-sup/returnList";
 import rules from "@/utils/rules";
 import { selectSplerMcsList } from "@/api/consumCataManage-sup/index";
-import {saveBoneTemplate} from "@/api/mainrTenance-sup/index"
+import {saveBoneTemplate,selectDeptList} from "@/api/mainrTenance-sup/index"
 export default {
   components: {
     ylStep,
@@ -321,8 +320,6 @@ export default {
         {value:"2",label:"222"},
       ],
       deptOptions:[
-        {value:"1",label:"111"},
-        {value:"2",label:"222"},
       ],
       isFasOptions: [
         { value: "1", label: "是" },
@@ -340,7 +337,11 @@ export default {
     };
   },
   created() {},
-  mounted() {},
+  mounted() {
+    selectDeptList({deptName:""}).then((res)=>{
+      this.deptOptions = res.data
+    })
+  },
   methods: {
     handleBc() {
       if (this.list.length == 0) {
@@ -409,15 +410,9 @@ export default {
       this.mcsDialog = true;
       this.dialogLoading = true;
       this.listQuery.current = "1";
-      selectSplerMcsList(this.listQuery)
-        .then((res) => {
-          this.mcsData = res.data.records;
-          this.totalD = res.data.total;
-          this.dialogLoading = false;
-        })
-        .catch((err) => {
-          this.dialogLoading = false;
-        });
+      this.getdiaMcs()
+      this.$refs.multipleTable.clearSelection()
+
     },
     getdiaMcs() {
       this.dialogLoading = true;
@@ -442,25 +437,25 @@ export default {
     //确认
     clickMcs() {
       this.mcsDialog = false;
-      this.list = this.dialogSelect;
-      // this.$refs.multipleTable.clearSelection()
+      this.list = this.list.concat(this.dialogSelect);
+      this.$refs.multipleTable.clearSelection()
     },
     // 删除
     handleDel(row, indexed) {
       this.list = this.list.filter((item) => item.hiCode !== row.hiCode);
     },
     // 禁选
-    // selected(row, index) {
-    //   if (
-    //     this.list.some((el) => {
-    //       return el.hiCode === row.hiCode;
-    //     })
-    //   ) {
-    //     return false;
-    //   } else {
-    //     return true;
-    //   }
-    // },
+    selected(row, index) {
+      if (
+        this.list.some((el) => {
+          return el.hiCode === row.hiCode;
+        })
+      ) {
+        return false;
+      } else {
+        return true;
+      }
+    },
   },
 };
 </script>

src/views/page/orderManage-sup/purOrderDelivery/deliveryDetail.vue

@@ -717,6 +717,7 @@
           type="primary"
           @click="clickMul"
           >确 认</el-button
+          :loading="fyLoad"
         >
       </div>
     </el-dialog>
@@ -740,7 +741,7 @@ import {
   finishDelvOrd,
   getBillPage,
   submitMcsDelvOrd,
-  delvOrdId,
+  selectDelvOrdCopy,
 } from "@/api/orderManage-sup/index";
 export default {
   components: {
@@ -871,6 +872,7 @@ export default {
         docmkDate: [],
         stas: "",
         spdId:this.$route.query.spdId,
+        fyLoad:false,
       }
     };
   },
@@ -1547,7 +1549,9 @@ export default {
     handlemultiplex(){
       this.mulDialog = true;
       this.getOutboundData()
-      this.roleRadio = ""
+      this.roleRadio = "";
+      this.purcOrdId = "";
+      
     },
     // 复用查询
     getOutboundData() {
@@ -1578,17 +1582,35 @@ export default {
     },
     // 复用确认
     clickMul(){
-      if(this.purcOrdId==""){
-        this.$message.error("请选择要复用的订单")
+      console.log(this.purcOrdId,"222")
+      if(!this.purcOrdId){
+        this.$message.warning("请选择要复用的订单")
       }else{
-        111({delvOrdId:this.listForm.id,purcOrdId:this.purcOrdId}).then((res)=>{
+        this.$confirm("确认复用该订单", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        selectDelvOrdCopy({delvOrdId:this.listForm.id,purcOrdId:this.purcOrdId}).then((res)=>{
+          this.fyLoad = true;
           if(res.success==true){
             this.$message.success("操作成功")
+            this.mulDialog = false;
+            this.fyLoad = false;
+            this.purcOrdId = "";
           }else{
-            this.$message.success("操作失败")
+            // this.$message.error("操作失败")
+            this.$message(res.message)
+            this.fyLoad = false;
+            this.purcOrdId="";
           }
+        }).catch((err)=>{
+            // this.$message(res.message)
+            this.fyLoad = false;
+            this.purcOrdId="";
         })
-          }
+        })
+      }
     },
     
   },