资质

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

@@ -1,5 +1,6 @@
 <template>
   <div>
+    <!-- <el-card style="width: 98%; margin-right: 18px; border-radius: 6px"> -->
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="基础信息" name="first">
         <el-form
@@ -79,6 +80,7 @@
                   <div class="content" v-if="isShow">
                     {{ infoData.prodEntp }}
                   </div>
+
                   <el-input
                     v-else
                     v-model="infoData.prodEntp"
@@ -456,7 +458,17 @@
       </el-tab-pane>
       <el-tab-pane label="资质信息" name="second">
         <div class="common-card">
-          <h3>商品资质</h3>
+          <div>
+            <h3>商品资质</h3>
+            <div class="right-type" v-if="addBtn">
+              <el-button
+                style="margin-bottom: 10px"
+                type="primary"
+                @click="handleAdd('one')"
+                >添加资质</el-button
+              >
+            </div>
+          </div>
           <el-table
             v-loading="listLoading"
             element-loading-text="加载中"
@@ -484,11 +496,22 @@
           </el-table>
         </div>
         <div class="common-card">
-          <h3>生产厂商资质</h3>
+          <div>
+            <h3>生产厂商资质</h3>
+            <div class="right-type">
+              <el-button
+                v-if="addBtn"
+                style="margin-bottom: 10px"
+                type="primary"
+                @click="handleAdd1('two')"
+                >添加资质</el-button
+              >
+            </div>
+          </div>
           <el-table
             v-loading="listLoading"
             element-loading-text="加载中"
-            :data="list"
+            :data="listC"
             fit
             stripe
             border
@@ -508,11 +531,92 @@
                 <span v-if="row.isFas == '1'">是</span>
               </template>
             </el-table-column>
-            <el-table-column label="备注" prop="purcUnt" />
+            <el-table-column label="备注" prop="memo" />
           </el-table>
         </div>
       </el-tab-pane>
     </el-tabs>
+    <!-- </el-card> -->
+    <el-dialog
+      class="addclass"
+      width="30%"
+      :title="textMap[dialogStatus]"
+      :close-on-click-modal="false"
+      :visible.sync="dialogFormVisible"
+      v-if="dialogFormVisible"
+    >
+      <el-form label-width="120px" :model="addform" ref="addForm">
+        <el-form-item
+          label="资质证书信息"
+          prop="quaCertName"
+          :rules="rules.selectRequired"
+        >
+          <el-select v-model.trim="addform.quaCertName" placeholder="请选择资质证书信息">
+            <el-option
+              v-for="item in qualData"
+              :key="item.id"
+              :label="item.dicVal"
+              :value="item.dicVal"
+              clearable
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="资质证书编号" prop="quaCertNo" :rules="rules.required">
+          <el-input
+            v-model="addform.quaCertNo"
+            placeholder="请输入资质证书编号"
+            maxlength="50"
+          ></el-input>
+        </el-form-item>
+
+        <el-form-item label="发证时间" prop="quaBeginTime" :rules="rules.dateRequired">
+          <el-date-picker
+            v-model.trim="addform.quaBeginTime"
+            type="date"
+            :picker-options="TimeOption1"
+            placeholder="选择日期"
+            value-format="yyyy-MM-dd"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="截止时间" prop="quaEndTime" :rules="rules.dateRequired">
+          <el-date-picker
+            v-model.trim="addform.quaEndTime"
+            type="date"
+            :picker-options="TimeOption"
+            placeholder="选择日期"
+            value-format="yyyy-MM-dd"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="资质证件" prop="invoFile" :rules="rules.uploadRequired">
+          <yl-upload :fileId="addform.invoFile" @getUpload="getUpload" urlName="acco">
+            <template v-slot:dec>只能上传pdf文件</template>
+          </yl-upload>
+          <!-- <yl-upload
+                v-else
+              :fileId="addform.invoFile"
+              readonly
+            >
+            </yl-upload> -->
+        </el-form-item>
+        <el-form-item label="备注" prop="memo">
+          <el-input
+            v-model="addform.memo"
+            placeholder="请输入备注"
+            maxlength="50"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer">
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button
+          type="primary"
+          v-preventReClick
+          v-loading="loading1"
+          @click="handledialog()"
+          >确 定</el-button
+        >
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -650,6 +754,25 @@ export default {
       reaDiv: false,
       // 禁用
       isShow: true,
+      dialogFormVisible: false,
+      loading1: false,
+      addform: {
+        quaCertName: "",
+        quaCertNo: "",
+        quaBeginTime: "",
+        quaEndTime: "",
+        quaAtt: "",
+        memo: "",
+        invoFile: "",
+      },
+      textMap: {
+        one: "商品资质",
+        two: "生产厂商资质",
+      },
+      dialogStatus: "",
+      addBtn: false,
+      list: [],
+      listC: [],
     };
   },
   created() {
@@ -671,21 +794,20 @@ export default {
     } else {
       this.getData();
     }
+    if (this.$route.query.type == "edit") {
+      this.addBtn = false;
+    } else {
+      this.addBtn = true;
+    }
   },
   methods: {
-    getUpload(id) {
-      this.temp.fileId = id;
-      if (id) {
-        this.$refs.dataForm.clearValidate("fileId");
-      } else {
-        this.$refs.dataForm.validateField("fileId");
-      }
-    },
     //获取列表数据
     getData() {
       selectMcsListIntfById({ id: this.$route.query.id })
         .then((response) => {
           this.infoData = response.data;
+          // this.list = red.data.data1;
+          // this.listC = red.data.data1;
           this.$refs["planForm"].resetFields();
         })
         .catch((err) => {
@@ -796,6 +918,65 @@ export default {
         });
       }
     },
+    // 新增资质
+    handleAdd(type) {
+      this.dialogFormVisible = true;
+      this.dialogStatus = type;
+    },
+    handleAdd1(type) {
+      this.dialogFormVisible = true;
+      this.dialogStatus = type;
+    },
+    getUpload(id) {
+      this.addform.invoFile = id;
+      if (id) {
+        this.$refs.addForm.clearValidate("invoFile");
+        console.log(this.addform.invoFile, "this.addform.invoFile");
+      } else {
+        this.$refs.addForm.validateField("invoFile");
+      }
+    },
+    // 确认
+    handledialog() {
+      this.$refs["addForm"].validate((valid) => {
+        if (valid) {
+          this.$confirm("确认提交", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.loading1 = true;
+              if (this.dialogStatus == "one") {
+              } else if (this.dialogStatus == "two") {
+              }
+              aaaa(this.addform)
+                .then((response) => {
+                  this.$message({
+                    message: "提交成功",
+                    type: "success",
+                  });
+                  this.loading1 = false;
+                  // this.$router.push({
+                  //   name: "InvoiceManage",
+                  //   query: {
+                  //     spdId: this.$route.query.spdId,
+                  //     activeNameTab: this.$route.query.activeNameTab,
+                  //   },
+                  // });
+                })
+                .catch(() => {
+                  this.loading1 = false;
+                  this.$message({
+                    message: "提交失败",
+                    type: "error",
+                  });
+                });
+            })
+            .catch(() => {});
+        }
+      });
+    },
   },
 };
 </script>
@@ -804,4 +985,7 @@ export default {
 // ::v-deep .el-input__inner {
 // width: 300px;
 // }
+.addclass ::v-deep .el-input__inner {
+  width: 260px;
+}
 </style>

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

@@ -1,129 +1,140 @@
 <template>
   <!-- 非挂网目录新增 -->
   <div>
-    <el-form :model="infoData" ref="planForm" label-width="150px" class="grid-form-class">
-      <div class="common-card">
-        <h3>商品基本资料</h3>
-        <!-- <div class="right-type" style="color: #3c64dc; font-weight: 800">
+    <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">
+            <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" :rules="rules.required">
-              <el-input
-                v-model="infoData.prodName"
-                placeholder="请输入耗材名称"
-                maxlength="50"
-              ></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" :rules="rules.required">
-              <el-input
-                v-model="infoData.prodEntp"
-                maxlength="50"
-                placeholder="请输入生产企业"
-              ></el-input>
-            </el-form-item>
-          </div>
-          <div class="flex-css">
-            <el-form-item label="代理企业" prop="agnt" :rules="rules.required">
-              <el-input
-                v-model="infoData.agnt"
-                placeholder="请输入代理企业"
-                maxlength="50"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="挂网价格" prop="pubonlnPric" :rules="rules.numPotNo">
-              <el-input
-                v-model="infoData.pubonlnPric"
-                placeholder="请输入挂网价格"
-                maxlength="50"
-              ></el-input>
-            </el-form-item>
+            <div class="form-body">
+              <div class="flex-css">
+                <el-form-item label="耗材名称" prop="prodName" :rules="rules.required">
+                  <el-input
+                    v-model="infoData.prodName"
+                    placeholder="请输入耗材名称"
+                    maxlength="50"
+                  ></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" :rules="rules.required">
+                  <el-input
+                    v-model="infoData.prodEntp"
+                    maxlength="50"
+                    placeholder="请输入生产企业"
+                  ></el-input>
+                </el-form-item>
+              </div>
+              <div class="flex-css">
+                <el-form-item label="代理企业" prop="agnt" :rules="rules.required">
+                  <el-input
+                    v-model="infoData.agnt"
+                    placeholder="请输入代理企业"
+                    maxlength="50"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="挂网价格" prop="pubonlnPric" :rules="rules.numPotNo">
+                  <el-input
+                    v-model="infoData.pubonlnPric"
+                    placeholder="请输入挂网价格"
+                    maxlength="50"
+                  ></el-input>
+                </el-form-item>
 
-            <el-form-item label="规格" prop="spec" :rules="rules.required">
-              <el-input
-                v-model="infoData.spec"
-                placeholder="请输入规格"
-                maxlength="50"
-              ></el-input>
-            </el-form-item>
-          </div>
-          <div class="flex-css">
-            <el-form-item label="型号" prop="mol" :rules="rules.required">
-              <el-input
-                v-model="infoData.mol"
-                placeholder="请输入型号"
-                maxlength="50"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="材质" prop="matl" :rules="rules.required">
-              <el-input
-                v-model="infoData.matl"
-                placeholder="请输入材质"
-                maxlength="50"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="包装材质" prop="pacmatl" :rules="rules.required">
-              <el-input
-                v-model="infoData.pacmatl"
-                placeholder="请输入包装材质"
-                maxlength="50"
-              ></el-input>
-            </el-form-item>
-          </div>
-          <div class="flex-css">
-            <el-form-item label="注册证号" prop="regcertno" :rules="rules.required">
-              <el-input
-                v-model="infoData.regcertno"
-                placeholder="请输入注册证号"
-                maxlength="50"
-              ></el-input>
-            </el-form-item>
+                <el-form-item label="规格" prop="spec" :rules="rules.required">
+                  <el-input
+                    v-model="infoData.spec"
+                    placeholder="请输入规格"
+                    maxlength="50"
+                  ></el-input>
+                </el-form-item>
+              </div>
+              <div class="flex-css">
+                <el-form-item label="型号" prop="mol" :rules="rules.required">
+                  <el-input
+                    v-model="infoData.mol"
+                    placeholder="请输入型号"
+                    maxlength="50"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="材质" prop="matl" :rules="rules.required">
+                  <el-input
+                    v-model="infoData.matl"
+                    placeholder="请输入材质"
+                    maxlength="50"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="包装材质" prop="pacmatl" :rules="rules.required">
+                  <el-input
+                    v-model="infoData.pacmatl"
+                    placeholder="请输入包装材质"
+                    maxlength="50"
+                  ></el-input>
+                </el-form-item>
+              </div>
+              <div class="flex-css">
+                <el-form-item label="注册证号" prop="regcertno" :rules="rules.required">
+                  <el-input
+                    v-model="infoData.regcertno"
+                    placeholder="请输入注册证号"
+                    maxlength="50"
+                  ></el-input>
+                </el-form-item>
+              </div>
+            </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">
+          <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"
@@ -133,60 +144,72 @@
                 ></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" :rules="rules.selectRequired">
-              <el-select
-                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 class="flex-css">
-            <el-form-item
-              label="集采批次"
-              prop="fasBtch"
-              v-if="infoData.isFas == '1'"
-              :rules="rules.required"
-            >
-              <el-input
-                v-model="infoData.fasBtch"
-                placeholder="请输入集采批次"
-                maxlength="50"
-              ></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-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" :rules="rules.selectRequired">
+                  <el-select
+                    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 class="flex-css">
+                <el-form-item
+                  label="集采批次"
+                  prop="fasBtch"
+                  v-if="infoData.isFas == '1'"
+                  :rules="rules.required"
+                >
+                  <el-input
+                    v-model="infoData.fasBtch"
+                    placeholder="请输入集采批次"
+                    maxlength="50"
+                  ></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"
@@ -196,134 +219,324 @@
                 ></el-option>
               </el-select>
             </el-form-item> -->
+              </div>
+            </div>
           </div>
-        </div>
-      </div>
-      <div class="common-card">
-        <h3>耗材编码资料</h3>
-        <div class="form-body">
-          <div class="flex-css">
-            <el-form-item label="医保编码" prop="hiCode" :rules="rules.required">
-              <el-input
-                v-model="infoData.hiCode"
-                placeholder="请输入医保编码"
-                maxlength="50"
-              ></el-input>
-            </el-form-item>
+          <div class="common-card">
+            <h3>耗材编码资料</h3>
+            <div class="form-body">
+              <div class="flex-css">
+                <el-form-item label="医保编码" prop="hiCode" :rules="rules.required">
+                  <el-input
+                    v-model="infoData.hiCode"
+                    placeholder="请输入医保编码"
+                    maxlength="50"
+                  ></el-input>
+                </el-form-item>
+              </div>
+            </div>
           </div>
-        </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
-                v-model="infoData.purcPric"
-                maxlength="50"
-                placeholder="请输入采购价"
-              ></el-input>
-            </el-form-item>
+          <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
+                    v-model="infoData.purcPric"
+                    maxlength="50"
+                    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>
+            </div>
           </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 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>
           </div>
+        </el-form>
+        <div class="foot-button" v-if="btnShow">
+          <el-button type="success" @click="handleSave" :loading="saveLoad"
+            >保存</el-button
+          >
+          <el-button type="primary" @click="handleSubmit" :loading="submitLoad"
+            >提交</el-button
+          >
         </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-tab-pane>
+      <el-tab-pane label="资质信息" name="second">
+        <div class="common-card">
+          <div>
+            <h3>商品资质</h3>
+            <div class="right-type">
+              <el-button
+                style="margin-bottom: 10px"
+                type="primary"
+                @click="handleAdd('one')"
+                >添加资质</el-button
               >
-                <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
+            </div>
+          </div>
+          <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 class="common-card">
+          <div>
+            <h3>生产厂商资质</h3>
+            <div class="right-type">
+              <el-button
+                style="margin-bottom: 10px"
+                type="primary"
+                @click="handleAdd1('two')"
+                >添加资质</el-button
               >
-                <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>
+          <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="memo" />
+          </el-table>
         </div>
+      </el-tab-pane>
+    </el-tabs>
+    <el-dialog
+      class="addclass"
+      width="30%"
+      :title="textMap[dialogStatus]"
+      :close-on-click-modal="false"
+      :visible.sync="dialogFormVisible"
+      v-if="dialogFormVisible"
+    >
+      <el-form label-width="120px" :model="addform" ref="addForm">
+        <el-form-item
+          label="资质证书信息"
+          prop="quaCertName"
+          :rules="rules.selectRequired"
+        >
+          <el-select v-model.trim="addform.quaCertName" placeholder="请选择资质证书信息">
+            <el-option
+              v-for="item in qualData"
+              :key="item.id"
+              :label="item.dicVal"
+              :value="item.dicVal"
+              clearable
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="资质证书编号" prop="quaCertNo" :rules="rules.required">
+          <el-input
+            v-model="addform.quaCertNo"
+            placeholder="请输入资质证书编号"
+            maxlength="50"
+          ></el-input>
+        </el-form-item>
+
+        <el-form-item label="发证时间" prop="quaBeginTime" :rules="rules.dateRequired">
+          <el-date-picker
+            v-model.trim="addform.quaBeginTime"
+            type="date"
+            :picker-options="TimeOption1"
+            placeholder="选择日期"
+            value-format="yyyy-MM-dd"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="截止时间" prop="quaEndTime" :rules="rules.dateRequired">
+          <el-date-picker
+            v-model.trim="addform.quaEndTime"
+            type="date"
+            :picker-options="TimeOption"
+            placeholder="选择日期"
+            value-format="yyyy-MM-dd"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="资质证件" prop="invoFile" :rules="rules.uploadRequired">
+          <yl-upload :fileId="addform.invoFile" @getUpload="getUpload" urlName="acco">
+            <template v-slot:dec>只能上传pdf文件</template>
+          </yl-upload>
+          <!-- <yl-upload
+                v-else
+              :fileId="addform.invoFile"
+              readonly
+            >
+            </yl-upload> -->
+        </el-form-item>
+        <el-form-item label="备注" prop="memo">
+          <el-input
+            v-model="addform.memo"
+            placeholder="请输入备注"
+            maxlength="50"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer">
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button
+          type="primary"
+          v-preventReClick
+          v-loading="loading1"
+          @click="handledialog()"
+          >确 定</el-button
+        >
       </div>
-    </el-form>
-    <div class="foot-button" v-if="btnShow">
-      <el-button type="success" @click="handleSave" :loading="saveLoad">保存</el-button>
-      <el-button type="primary" @click="handleSubmit" :loading="submitLoad"
-        >提交</el-button
-      >
-    </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -336,6 +549,7 @@ export default {
   components: { ylUpload, ylStep },
   data() {
     return {
+      activeName: "first",
       saveLoad: false,
       submitLoad: false,
       rules,
@@ -468,6 +682,22 @@ export default {
         { value: "束", label: "束" },
       ],
       btnShow: true,
+      dialogFormVisible: false,
+      loading1: false,
+      addform: {
+        quaCertName: "",
+        quaCertNo: "",
+        quaBeginTime: "",
+        quaEndTime: "",
+        quaAtt: "",
+        memo: "",
+        invoFile: "",
+      },
+      textMap: {
+        one: "商品资质",
+        two: "生产厂商资质",
+      },
+      dialogStatus: "",
     };
   },
   created() {
@@ -565,6 +795,65 @@ export default {
     //       this.$message.error("获取数据失败");
     //     });
     // },
+    // 新增资质
+    handleAdd(type) {
+      this.dialogFormVisible = true;
+      this.dialogStatus = type;
+    },
+    handleAdd1(type) {
+      this.dialogFormVisible = true;
+      this.dialogStatus = type;
+    },
+    getUpload(id) {
+      this.addform.invoFile = id;
+      if (id) {
+        this.$refs.addForm.clearValidate("invoFile");
+        console.log(this.addform.invoFile, "this.addform.invoFile");
+      } else {
+        this.$refs.addForm.validateField("invoFile");
+      }
+    },
+    // 确认
+    handledialog() {
+      this.$refs["addForm"].validate((valid) => {
+        if (valid) {
+          this.$confirm("确认提交", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.loading1 = true;
+              if (this.dialogStatus == "one") {
+              } else if (this.dialogStatus == "two") {
+              }
+              aaaa(this.addform)
+                .then((response) => {
+                  this.$message({
+                    message: "提交成功",
+                    type: "success",
+                  });
+                  this.loading1 = false;
+                  // this.$router.push({
+                  //   name: "InvoiceManage",
+                  //   query: {
+                  //     spdId: this.$route.query.spdId,
+                  //     activeNameTab: this.$route.query.activeNameTab,
+                  //   },
+                  // });
+                })
+                .catch(() => {
+                  this.loading1 = false;
+                  this.$message({
+                    message: "提交失败",
+                    type: "error",
+                  });
+                });
+            })
+            .catch(() => {});
+        }
+      });
+    },
   },
 };
 </script>

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

@@ -62,10 +62,8 @@
         </el-form-item>
       </el-form>
       <div class="right-button" v-if="btnShow">
-      <el-button type="primary" @click="handleAdd"
-        >新增模板</el-button
-      >
-    </div>
+        <el-button type="primary" @click="handleAdd">新增模板</el-button>
+      </div>
       <el-table
         v-loading="listLoading"
         element-loading-text="加载中"
@@ -83,7 +81,7 @@
         <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="deptName">
           <!-- <template #default="{ row }">
             <span v-for="item in deptOptions" :key="item.id">{{item.deptName}} </span>
           </template> -->
@@ -94,7 +92,9 @@
         <el-table-column label="操作" width="100">
           <template slot-scope="scope">
             <el-button type="text" @click="handleDetail(scope.row)">编辑</el-button>
-            <el-button type="text" style="color:red" @click="handleDel(scope.row)">删除</el-button>
+            <el-button type="text" style="color: red" @click="handleDel(scope.row)"
+              >删除</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -113,14 +113,18 @@
 <script>
 import ylPagination from "@/components/yl-pagination";
 import { selectSpdList } from "@/api/orderManage-sup/index";
-import { getBoneTemplatePage,updateBoneTemplate,selectDeptList  } from "@/api/mainrTenance-sup/index"
+import {
+  getBoneTemplatePage,
+  updateBoneTemplate,
+  selectDeptList,
+} from "@/api/mainrTenance-sup/index";
 export default {
   components: {
     ylPagination,
   },
   data() {
     return {
-      btnShow:false,
+      btnShow: false,
       activeNametree: "org",
       data: [],
       spdId: null,
@@ -135,9 +139,9 @@ export default {
         oprn: "",
         dept: "",
         lstUpdUsrName: [],
-        dateStart:"",
-        dateEnd:"",
-        spdId:"",
+        dateStart: "",
+        dateEnd: "",
+        spdId: "",
       },
       stasOptions: [
         { value: "A", lable: "待确认" },
@@ -146,21 +150,20 @@ export default {
       listLoading: false,
       list: [],
       total: 0,
-      oprnOptions:[
-        {value:"头部手术",label:"头部手术"},
-        {value:"颈部手术",label:"颈部手术"},
-        {value:"骨科手术",label:"骨科手术"}
-      ],
-      deptOptions:[
+      oprnOptions: [
+        { value: "头部手术", label: "头部手术" },
+        { value: "颈部手术", label: "颈部手术" },
+        { value: "骨科手术", label: "骨科手术" },
       ],
+      deptOptions: [],
     };
   },
   mounted() {
     this.getData();
     if (this.$route.query.spdId) {
       this.listQuery.spdId = this.$route.query.spdId;
-      this.getorderData()
-      this.btnShow = true
+      this.getorderData();
+      this.btnShow = true;
 
       // getBoneTemplatePage(this.listQuery)
       //   .then((res) => {
@@ -172,9 +175,9 @@ export default {
       //     this.listLoading = false;
       //   });
     }
-    selectDeptList({deptName:""}).then((res)=>{
-      this.deptOptions = res.data
-    })
+    selectDeptList({ deptName: "" }).then((res) => {
+      this.deptOptions = res.data;
+    });
   },
   methods: {
     tabClick(tab) {
@@ -198,13 +201,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
+          this.list.forEach((v) => {
+            this.deptOptions.forEach((i) => {
+              if (v.dept == i.id) {
+                v.dept = i.deptName;
               }
-            })
-          })
+            });
+          });
         })
         .catch((err) => {
           this.listLoading = false;
@@ -233,13 +236,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
+          this.list.forEach((v) => {
+            this.deptOptions.forEach((i) => {
+              if (v.dept == i.id) {
+                v.dept = i.deptName;
               }
-            })
-          })
+            });
+          });
         })
         .catch((err) => {
           this.listLoading = false;
@@ -252,50 +255,49 @@ export default {
     // 详情
     handleDetail(row) {
       console.log(row, "row");
-        this.$router.push({
-          name: "editbag",
-          query: {
-            tmplNo: row.tmplNo,
-            // spdId: this.$route.query.spdId,
-            spdId: this.spdId,
-            tmplName: row.tmplName,
-            oprn: row.oprn,
-            dept: row.dept,
-            id:row.id,
-            crteUsrName:row.crteUsrName,
-            tmplNo:row.tmplNo
-          },
-        });
+      this.$router.push({
+        name: "editbag",
+        query: {
+          tmplNo: row.tmplNo,
+          // spdId: this.$route.query.spdId,
+          spdId: this.spdId,
+          tmplName: row.tmplName,
+          oprn: row.oprn,
+          dept: row.dept,
+          id: row.id,
+          crteUsrName: row.crteUsrName,
+          tmplNo: row.tmplNo,
+        },
+      });
     },
-    handleAdd(){
-        this.$router.push({
-          name: "indexDetail",
-          query: {
-            spdId: this.spdId,
-          },
-        });
+    handleAdd() {
+      this.$router.push({
+        name: "indexDetail",
+        query: {
+          spdId: this.spdId,
+        },
+      });
     },
     // 删除
     handleDel(row) {
       this.$confirm("确认删除", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
         .then(() => {
-          updateBoneTemplate({ tmplNo: row.tmplNo,splerId:row.splerId })
+          updateBoneTemplate({ tmplNo: row.tmplNo, splerId: row.splerId })
             .then((response) => {
               this.$message({
                 message: "删除成功",
-                type: "success"
+                type: "success",
               });
-              this.getorderData()
+              this.getorderData();
             })
             .catch((err) => {});
         })
         .catch(() => {});
-    }
-    
+    },
   },
 };
 </script>

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

@@ -78,13 +78,13 @@
           </template>
           <!-- <el-table-column type="selection" width="60" /> -->
           <el-table-column fixed type="index" label="序号" width="60" />
-          <el-table-column label="耗材编码" prop="materialId" />
-          <el-table-column label="医保编码" prop="hiCode" />
+          <!-- <el-table-column label="耗材编码" prop="materialId" /> -->
           <el-table-column label="耗材信息" prop="prodName" width="300">
             <template slot-scope="scope">
               <mcs-info :info="scope.row"></mcs-info>
             </template>
           </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="matl" />
@@ -225,13 +225,13 @@
           :selectable="selected"
         />
         <el-table-column type="index" label="序号" width="60" />
-        <el-table-column label="耗材编码" prop="materialId" />
-        <el-table-column label="医保编码" prop="hiCode" />
+        <!-- <el-table-column label="耗材编码" prop="materialId" /> -->
         <el-table-column label="耗材信息" prop="prodName" width="300">
           <template slot-scope="scope">
             <mcs-info :info="scope.row"></mcs-info>
           </template>
         </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="matl" />
@@ -241,7 +241,7 @@
             <span v-if="row.isFas == '1'">是</span>
           </template>
         </el-table-column>
-        <el-table-column label="供应商" prop="retnCnt" />
+        <el-table-column label="供应商" prop="crteUsrName" />
         <el-table-column label="申领包装" prop="convrat">
           <template #default="{ row }">
             <span

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

@@ -78,13 +78,13 @@
           </template>
           <!-- <el-table-column type="selection" width="60" /> -->
           <el-table-column fixed type="index" label="序号" width="60" />
-          <el-table-column label="耗材编码" prop="materialId" />
-          <el-table-column label="医保编码" prop="hiCode" />
+          <!-- <el-table-column label="耗材编码" prop="materialId" /> -->
           <el-table-column label="耗材信息" prop="prodName" width="300">
             <template slot-scope="scope">
               <mcs-info :info="scope.row"></mcs-info>
             </template>
           </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="matl" />
@@ -225,13 +225,13 @@
           :selectable="selected"
         />
         <el-table-column type="index" label="序号" width="60" />
-        <el-table-column label="耗材编码" prop="materialId" />
-        <el-table-column label="医保编码" prop="hiCode" />
+        <!-- <el-table-column label="耗材编码" prop="materialId" /> -->
         <el-table-column label="耗材信息" prop="prodName" width="300">
           <template slot-scope="scope">
             <mcs-info :info="scope.row"></mcs-info>
           </template>
         </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="matl" />
@@ -241,7 +241,7 @@
             <span v-if="row.isFas == '1'">是</span>
           </template>
         </el-table-column>
-        <el-table-column label="供应商" prop="retnCnt" />
+        <el-table-column label="供应商" prop="crteUsrName" />
         <el-table-column label="申领包装" prop="convrat">
           <template #default="{ row }">
             <span

src/views/page/orderManage-sup/purOrderAccept/index.vue

@@ -1,10 +1,10 @@
 <template>
   <!-- 采购订单受理（待确认已确认） -->
-  <div style="display:flex">
-    <el-card style="width:18%;margin-right:18px;border-radius:6px;">
+  <div style="display: flex">
+    <el-card style="width: 18%; margin-right: 18px; border-radius: 6px">
       <el-tabs v-model="activeNametree" type="card" @tab-click="tabClick" stretch>
-          <!-- <el-tab-pane label="按分类" name="grp"></el-tab-pane> -->
-          <el-tab-pane label="按机构" name="org"></el-tab-pane>
+        <!-- <el-tab-pane label="按分类" name="grp"></el-tab-pane> -->
+        <el-tab-pane label="按机构" name="org"></el-tab-pane>
       </el-tabs>
       <el-tree
         :data="data"
@@ -12,11 +12,11 @@
         node-key="spdId"
         @node-click="handleNodeClick"
         default-expand-all="true"
-        style="margin-top:10px;"
+        style="margin-top: 10px"
       >
-       <span class="custom-tree-node" slot-scope="{ node, data }">
-          <div>{{node.label}}</div>
-          <div class="redTit">{{data.wslnum}}</div> 
+        <span class="custom-tree-node" slot-scope="{ node, data }">
+          <div>{{ node.label }}</div>
+          <div class="redTit">{{ data.wslnum }}</div>
         </span>
       </el-tree>
     </el-card>
@@ -79,7 +79,7 @@
             <el-table-column label="采购时间" prop="docmkDate" width="140" />
             <el-table-column label="采购类型" prop="purcType" width="100">
               <template #default="{ row }">
-                <span v-if="row.purcType=='2'">{{row.oprn}}</span>
+                <span v-if="row.purcType == '2'">{{ row.oprn }}</span>
                 <span v-if="row.purcType == '1'">普通采购</span>
               </template>
             </el-table-column>
@@ -111,10 +111,10 @@
         </el-tab-pane>
         <el-tab-pane label="已确认" name="second">
           <el-form :model="listQueryC" ref="queryFormC" :inline="true">
-            <el-form-item label="采购单号" prop="id"  class="long">
+            <el-form-item label="采购单号" prop="id" class="long">
               <el-input v-model="listQueryC.id" placeholder="请输入采购单号"></el-input>
             </el-form-item>
-            <el-form-item label="客户名称" prop="branchName"  class="long">
+            <el-form-item label="客户名称" prop="branchName" class="long">
               <el-input
                 v-model="listQueryC.branchName"
                 placeholder="请输入客户名称"
@@ -126,7 +126,7 @@
                 placeholder="请输入来源部门"
               ></el-input>
             </el-form-item>
-            <el-form-item label="采购时间" prop="docmkDate"  class="long">
+            <el-form-item label="采购时间" prop="docmkDate" class="long">
               <el-date-picker
                 v-model="listQueryC.docmkDate"
                 type="daterange"
@@ -159,25 +159,25 @@
             <el-table-column type="index" label="序号" width="60" />
             <el-table-column label="订单编号" prop="id" />
             <el-table-column label="订单种类" prop="detlCnt" />
-            <el-table-column label="订单总数量" prop="qtySum"  width="100"/>
+            <el-table-column label="订单总数量" prop="qtySum" width="100" />
             <el-table-column label="出库数量" prop="delvCnt" />
-            <el-table-column label="订单总金额" prop="purcAmt"   width="100"/>
+            <el-table-column label="订单总金额" prop="purcAmt" width="100" />
             <el-table-column label="客户名称" prop="branchName" />
             <el-table-column label="来源部门" prop="deptName" />
             <el-table-column label="发起时间" prop="docmkDate" width="160" />
-            <el-table-column label="采购类型" prop="oprn" width="100">
+            <el-table-column label="采购类型" prop="purcType" width="100">
               <template #default="{ row }">
-                <span v-if="row.oprn">{{row.oprn}}</span>
-                <span v-if="row.oprn == ''">普通采购</span>
+                <span v-if="row.purcType == '2'">{{ row.oprn }}</span>
+                <span v-if="row.purcType == '1'">普通采购</span>
               </template>
             </el-table-column>
             <el-table-column label="受理人" prop="acper" />
-            <el-table-column label="受理时间" prop="acpDate"  width="160" />
+            <el-table-column label="受理时间" prop="acpDate" width="160" />
             <el-table-column label="状态" prop="stas">
               <template #default="{ row }">
                 <span v-if="row.stas == 'A'">未受理</span>
                 <span v-if="row.stas == 'B'">已受理</span>
-                 <span v-if="row.stas == 'R'">被驳回</span>
+                <span v-if="row.stas == 'R'">被驳回</span>
                 <span v-if="row.stas == 'C'">已出库</span>
                 <span v-if="row.stas == 'D'">部分出库</span>
                 <span v-if="row.stas == 'Y'">已入库</span>
@@ -206,17 +206,21 @@
 
 <script>
 import ylPagination from "@/components/yl-pagination";
-import { getMcsOrdPageSpler, getMcsOrdPageYqrSpler,selectSpdList} from "@/api/orderManage-sup/index";
+import {
+  getMcsOrdPageSpler,
+  getMcsOrdPageYqrSpler,
+  selectSpdList,
+} from "@/api/orderManage-sup/index";
 export default {
   components: {
     ylPagination,
   },
   data() {
     return {
-      activeNametree:"org",
+      activeNametree: "org",
       activeName: "first",
-      data:[],
-      spdId:null,
+      data: [],
+      spdId: null,
       defaultProps: {
         children: "children",
         label: "spdName",
@@ -231,8 +235,7 @@ export default {
         docmkDate: [],
         stas: "",
         branchName: "",
-        spdId:"",
-
+        spdId: "",
       },
       listQueryC: {
         current: 1,
@@ -244,7 +247,7 @@ export default {
         docmkDate: [],
         stas: "",
         branchName: "",
-        spdId:""
+        spdId: "",
       },
       stasOptions: [
         { value: "A", lable: "未受理" },
@@ -265,7 +268,7 @@ export default {
   },
   mounted() {
     this.getData();
-    if (this.$route.query.spdId && this.$route.query.activeName =='first') {
+    if (this.$route.query.spdId && this.$route.query.activeName == "first") {
       this.listQuery.spdId = this.$route.query.spdId;
       getMcsOrdPageSpler(this.listQuery)
         .then((res) => {
@@ -276,9 +279,9 @@ export default {
         .catch((err) => {
           this.listLoading = false;
         });
-    };
-    if (this.$route.query.spdId && this.$route.query.activeName =='second') {
-      this.activeName='second'
+    }
+    if (this.$route.query.spdId && this.$route.query.activeName == "second") {
+      this.activeName = "second";
       this.listQueryC.spdId = this.$route.query.spdId;
       getMcsOrdPageYqrSpler(this.listQueryC)
         .then((res) => {
@@ -289,7 +292,7 @@ export default {
         .catch((err) => {
           this.listLoading = false;
         });
-    };
+    }
   },
   methods: {
     tabClick(tab) {
@@ -318,8 +321,7 @@ export default {
           this.data = res.data;
           console.log(this.data, "dadad");
         })
-        .catch((err) => {
-        });
+        .catch((err) => {});
     },
     getorderData(type) {
       if (type == "search") {
@@ -378,13 +380,13 @@ export default {
           stas: row.stas,
           deptName: row.deptName,
           branchName: row.branchName,
-          spdId:this.listQuery.spdId,
-          activeName:this.activeName,
-          oprn:row.oprn,
-          oprtRoom:row.oprtRoom,
-          oprtTime:row.oprtTime,
-          atddr:row.atddr,
-          purcType:row.purcType,
+          spdId: this.listQuery.spdId,
+          activeName: this.activeName,
+          oprn: row.oprn,
+          oprtRoom: row.oprtRoom,
+          oprtTime: row.oprtTime,
+          atddr: row.atddr,
+          purcType: row.purcType,
         },
       });
     },
@@ -427,13 +429,13 @@ export default {
           stas: row.stas,
           deptName: row.deptName,
           branchName: row.branchName,
-          spdId:this.listQueryC.spdId,
-          activeName:this.activeName,
-          oprn:row.oprn,
-          oprtRoom:row.oprtRoom,
-          oprtTime:row.oprtTime,
-          atddr:row.atddr,
-          purcType:row.purcType,
+          spdId: this.listQueryC.spdId,
+          activeName: this.activeName,
+          oprn: row.oprn,
+          oprtRoom: row.oprtRoom,
+          oprtTime: row.oprtTime,
+          atddr: row.atddr,
+          purcType: row.purcType,
         },
       });
     },
@@ -442,7 +444,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-::v-deep .long  .el-input__inner {
+::v-deep .long .el-input__inner {
   width: 199px;
 }
 .right-common-box ::v-deep .el-table__fixed {
@@ -452,12 +454,12 @@ export default {
 .right-common-box ::v-deep .el-table__fixed-right {
   height: 100% !important;
 }
-.custom-tree-node{
+.custom-tree-node {
   display: flex;
   flex-direction: row;
   justify-content: space-between;
 }
-.custom-tree-node ::v-deep .redTit{
+.custom-tree-node ::v-deep .redTit {
   min-width: 30px;
   background-color: #f56c6c;
   min-height: 1px;

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

@@ -1,10 +1,10 @@
 <template>
   <!-- 采购订单出库 -->
-  <div style="display:flex">
-  <el-card style="width:18%;margin-right:18px;border-radius:6px;">
+  <div style="display: flex">
+    <el-card style="width: 18%; margin-right: 18px; border-radius: 6px">
       <el-tabs v-model="activeNametree" type="card" @tab-click="tabClick" stretch>
-          <!-- <el-tab-pane label="按分类" name="grp"></el-tab-pane> -->
-          <el-tab-pane label="按机构" name="org"></el-tab-pane>
+        <!-- <el-tab-pane label="按分类" name="grp"></el-tab-pane> -->
+        <el-tab-pane label="按机构" name="org"></el-tab-pane>
       </el-tabs>
       <el-tree
         :data="data"
@@ -12,43 +12,46 @@
         node-key="spdId"
         @node-click="handleNodeClick"
         default-expand-all="true"
-        style="margin-top:10px;"
+        style="margin-top: 10px"
       >
-      <span class="custom-tree-node" slot-scope="{ node, data }">
-          <div>{{node.label}}</div>
-          <div class="redTit">{{data.wcknum}}</div> 
+        <span class="custom-tree-node" slot-scope="{ node, data }">
+          <div>{{ node.label }}</div>
+          <div class="redTit">{{ data.wcknum }}</div>
         </span>
       </el-tree>
     </el-card>
-  <div class="right-common-box">
-    <el-tabs v-model="activeName" @tab-click="handleClick">
-      <el-tab-pane label="待出库" name="first">
-        <el-form :model="listQuery" ref="queryForm" :inline="true">
-          <el-form-item label="采购单号" prop="id">
-            <el-input v-model="listQuery.id" placeholder="请输入采购单号"></el-input>
-          </el-form-item>
-          <el-form-item label="客户名称" prop="branchName">
-            <el-input v-model="listQuery.branchName" placeholder="请输入客户名称"></el-input>
-          </el-form-item>
-          <el-form-item label="来源部门" prop="deptName">
+    <div class="right-common-box">
+      <el-tabs v-model="activeName" @tab-click="handleClick">
+        <el-tab-pane label="待出库" name="first">
+          <el-form :model="listQuery" ref="queryForm" :inline="true">
+            <el-form-item label="采购单号" prop="id">
+              <el-input v-model="listQuery.id" placeholder="请输入采购单号"></el-input>
+            </el-form-item>
+            <el-form-item label="客户名称" prop="branchName">
+              <el-input
+                v-model="listQuery.branchName"
+                placeholder="请输入客户名称"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="来源部门" prop="deptName">
               <el-input
                 v-model="listQuery.deptName"
                 placeholder="请输入来源部门"
               ></el-input>
             </el-form-item>
-          <el-form-item label="采购时间" prop="docmkDate">
-            <el-date-picker
-              v-model="listQuery.docmkDate"
-              type="daterange"
-              range-separator="至"
-              :editable="false"
-              value-format="yyyy-MM-dd"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-              style="width: 230px"
-            />
-          </el-form-item>
-          <!-- <el-form-item label="当前状态" prop="stas">
+            <el-form-item label="采购时间" prop="docmkDate">
+              <el-date-picker
+                v-model="listQuery.docmkDate"
+                type="daterange"
+                range-separator="至"
+                :editable="false"
+                value-format="yyyy-MM-dd"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+                style="width: 230px"
+              />
+            </el-form-item>
+            <!-- <el-form-item label="当前状态" prop="stas">
                 <el-select
                     v-model="listQuery.stas"
                     placeholder="请选择"
@@ -62,41 +65,43 @@
                     ></el-option>
                 </el-select>
             </el-form-item> -->
-          <el-form-item>
-            <el-button type="primary" @click="getOutboundData('search')">查询 </el-button>
-            <el-button @click="reset">重置</el-button>
-          </el-form-item>
-        </el-form>
-        <el-table
-          v-loading="listLoading"
-          element-loading-text="加载中"
-          :data="list"
-          fit
-          stripe
-          border
-          height="500px"
-        >
-          <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="订单编号" prop="id" />
-          <el-table-column label="订单种类" prop="detlCnt" />
-          <el-table-column label="订单总数量" prop="qtySum" />
-          <el-table-column label="剩余出库量" prop="delvCnt"/>
-          <el-table-column label="订单总金额" prop="purcAmt" width="100px"/>
-          <el-table-column label="客户名称" prop="branchName" />
-          <el-table-column label="来源部门" prop="deptName" />
-          <el-table-column label="采购类型" prop="purcType" width="100">
-            <template #default="{ row }">
-                <span v-if="row.purcType=='2'">{{row.oprn}}</span>
+            <el-form-item>
+              <el-button type="primary" @click="getOutboundData('search')"
+                >查询
+              </el-button>
+              <el-button @click="reset">重置</el-button>
+            </el-form-item>
+          </el-form>
+          <el-table
+            v-loading="listLoading"
+            element-loading-text="加载中"
+            :data="list"
+            fit
+            stripe
+            border
+            height="500px"
+          >
+            <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="订单编号" prop="id" />
+            <el-table-column label="订单种类" prop="detlCnt" />
+            <el-table-column label="订单总数量" prop="qtySum" />
+            <el-table-column label="剩余出库量" prop="delvCnt" />
+            <el-table-column label="订单总金额" prop="purcAmt" width="100px" />
+            <el-table-column label="客户名称" prop="branchName" />
+            <el-table-column label="来源部门" prop="deptName" />
+            <el-table-column label="采购类型" prop="purcType" width="100">
+              <template #default="{ row }">
+                <span v-if="row.purcType == '2'">{{ row.oprn }}</span>
                 <span v-if="row.purcType == '1'">普通采购</span>
               </template>
             </el-table-column>
-          <el-table-column label="采购时间" prop="docmkDate" width="140" />
-          <el-table-column label="状态" prop="stas">
-            <!-- <template #default="{ row }">
+            <el-table-column label="采购时间" prop="docmkDate" width="140" />
+            <el-table-column label="状态" prop="stas">
+              <!-- <template #default="{ row }">
               <span v-if="row.stas == 'A'">未受理</span>
               <span v-if="row.stas == 'B'">未出库</span>
               <span v-if="row.stas == 'R'">被驳回</span>
@@ -105,61 +110,61 @@
               <span v-if="row.stas == 'Y'">已入库</span>
               <span v-if="row.stas == 'P'">部分入库</span>
             </template> -->
-          </el-table-column>
-          <el-table-column label="操作" width="100" fixed="right">
-            <template slot-scope="scope">
-              <el-button type="text" @click="handleDetail(scope.row)">详情</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <!--分页-->
-        <yl-pagination
-          v-show="total > 0"
-          :total="total"
-          :page.sync="listQuery.current"
-          :limit.sync="listQuery.size"
-          @pagination="getOutboundData"
-        />
-      </el-tab-pane>
-      <el-tab-pane label="已出库" name="second">
-        <el-form :model="listQueryC" ref="queryFormC" :inline="true">
-          <el-form-item label="出库单号" prop="delvOrdId">
-            <el-input
-              v-model="listQueryC.delvOrdId"
-              placeholder="请输入出库单号"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="关联采购单" prop="purcOrdId">
-            <el-input
-              v-model="listQueryC.purcOrdId"
-              placeholder="请输入关联采购单"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="客户名称" prop="branchName">
-            <el-input
-              v-model="listQueryC.branchName"
-              placeholder="请输入客户名称"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="来源部门" prop="deptName">
+            </el-table-column>
+            <el-table-column label="操作" width="100" fixed="right">
+              <template slot-scope="scope">
+                <el-button type="text" @click="handleDetail(scope.row)">详情</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <!--分页-->
+          <yl-pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="listQuery.current"
+            :limit.sync="listQuery.size"
+            @pagination="getOutboundData"
+          />
+        </el-tab-pane>
+        <el-tab-pane label="已出库" name="second">
+          <el-form :model="listQueryC" ref="queryFormC" :inline="true">
+            <el-form-item label="出库单号" prop="delvOrdId">
+              <el-input
+                v-model="listQueryC.delvOrdId"
+                placeholder="请输入出库单号"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="关联采购单" prop="purcOrdId">
+              <el-input
+                v-model="listQueryC.purcOrdId"
+                placeholder="请输入关联采购单"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="客户名称" prop="branchName">
+              <el-input
+                v-model="listQueryC.branchName"
+                placeholder="请输入客户名称"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="来源部门" prop="deptName">
               <el-input
                 v-model="listQueryC.deptName"
                 placeholder="请输入来源部门"
               ></el-input>
             </el-form-item>
-          <el-form-item label="出库时间" prop="docmkDate">
-            <el-date-picker
-              v-model="listQueryC.docmkDate"
-              type="daterange"
-              range-separator="至"
-              :editable="false"
-              value-format="yyyy-MM-dd"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-              style="width: 230px"
-            />
-          </el-form-item>
-          <!-- <el-form-item label="当前状态" prop="purcOrdStas">
+            <el-form-item label="出库时间" prop="docmkDate">
+              <el-date-picker
+                v-model="listQueryC.docmkDate"
+                type="daterange"
+                range-separator="至"
+                :editable="false"
+                value-format="yyyy-MM-dd"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+                style="width: 230px"
+              />
+            </el-form-item>
+            <!-- <el-form-item label="当前状态" prop="purcOrdStas">
                 <el-select
                     v-model="listQuery.purcOrdStas"
                     placeholder="请选择"
@@ -173,70 +178,72 @@
                     ></el-option>
                 </el-select>
             </el-form-item> -->
-          <el-form-item>
-            <el-button type="primary" @click="getOutboundDataC('search')">查询 </el-button>
-            <el-button @click="resetC">重置</el-button>
-          </el-form-item>
-        </el-form>
-        <el-table
-          v-loading="listLoading"
-          element-loading-text="加载中"
-          :data="listC"
-          fit
-          stripe
-          border
-          height="500px"
-        >
-          <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="出库单号" prop="delvOrdId" />
-          <el-table-column label="关联采购单" prop="purcOrdId" />
-          <el-table-column label="采购品种数" prop="detlCnt"/>
-          <el-table-column label="采购总数量" prop="qtySum"/>
-          <el-table-column label="本次出库量" prop="bcckl" />
-          <el-table-column label="客户验收数量" prop="shppCnt" width="100px"/>
-          <el-table-column label="剩余出库量" prop="toDelvCnt" width="100px"/>
-          <el-table-column label="客户名称" prop="branchName" />
-          <el-table-column label="来源部门" prop="deptName" />
-          <el-table-column label="采购类型" prop="oprn" width="100">
-            <template #default="{ row }">
-                <span v-if="row.oprn">{{row.oprn}}</span>
-                <span v-if="row.oprn == ''">普通采购</span>
+            <el-form-item>
+              <el-button type="primary" @click="getOutboundDataC('search')"
+                >查询
+              </el-button>
+              <el-button @click="resetC">重置</el-button>
+            </el-form-item>
+          </el-form>
+          <el-table
+            v-loading="listLoading"
+            element-loading-text="加载中"
+            :data="listC"
+            fit
+            stripe
+            border
+            height="500px"
+          >
+            <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="出库单号" prop="delvOrdId" />
+            <el-table-column label="关联采购单" prop="purcOrdId" />
+            <el-table-column label="采购品种数" prop="detlCnt" />
+            <el-table-column label="采购总数量" prop="qtySum" />
+            <el-table-column label="本次出库量" prop="bcckl" />
+            <el-table-column label="客户验收数量" prop="shppCnt" width="100px" />
+            <el-table-column label="剩余出库量" prop="toDelvCnt" width="100px" />
+            <el-table-column label="客户名称" prop="branchName" />
+            <el-table-column label="来源部门" prop="deptName" />
+            <el-table-column label="采购类型" prop="purcType" width="100">
+              <template #default="{ row }">
+                <span v-if="row.purcType == '2'">{{ row.oprn }}</span>
+                <span v-if="row.purcType == '1'">普通采购</span>
               </template>
             </el-table-column>
-          <el-table-column label="出库员" prop="docmker" />
-          <el-table-column label="出库时间" prop="docmkDate" width="140" />
-          <el-table-column label="状态" prop="delvOrdStas" width="100">
-            <template #default="{ row }">
-              <span v-if="row.delvOrdStas == 'A'">未受理</span>
-              <span v-if="row.delvOrdStas == 'B'">已受理</span>
-              <span v-if="row.delvOrdStas == 'R'">被驳回</span>
-              <span v-if="row.delvOrdStas == 'C'">已出库</span>
-              <span v-if="row.delvOrdStas == 'D'">部分出库</span>
-              <span v-if="row.delvOrdStas == 'Y'">已入库</span>
-              <span v-if="row.delvOrdStas == 'P'">部分入库</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" width="100" fixed="right">
-            <template slot-scope="scope">
-              <el-button type="text" @click="handleDetailC(scope.row)">详情</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <!--分页-->
-        <yl-pagination
-          v-show="totalC > 0"
-          :total="totalC"
-          :page.sync="listQueryC.current"
-          :limit.sync="listQueryC.size"
-          @pagination="getOutboundDataC"
-        />
-      </el-tab-pane>
-    </el-tabs>
-  </div>
+            <el-table-column label="出库员" prop="docmker" />
+            <el-table-column label="出库时间" prop="docmkDate" width="140" />
+            <el-table-column label="状态" prop="delvOrdStas" width="100">
+              <template #default="{ row }">
+                <span v-if="row.delvOrdStas == 'A'">未受理</span>
+                <span v-if="row.delvOrdStas == 'B'">已受理</span>
+                <span v-if="row.delvOrdStas == 'R'">被驳回</span>
+                <span v-if="row.delvOrdStas == 'C'">已出库</span>
+                <span v-if="row.delvOrdStas == 'D'">部分出库</span>
+                <span v-if="row.delvOrdStas == 'Y'">已入库</span>
+                <span v-if="row.delvOrdStas == 'P'">部分入库</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="100" fixed="right">
+              <template slot-scope="scope">
+                <el-button type="text" @click="handleDetailC(scope.row)">详情</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <!--分页-->
+          <yl-pagination
+            v-show="totalC > 0"
+            :total="totalC"
+            :page.sync="listQueryC.current"
+            :limit.sync="listQueryC.size"
+            @pagination="getOutboundDataC"
+          />
+        </el-tab-pane>
+      </el-tabs>
+    </div>
   </div>
 </template>
 
@@ -245,7 +252,7 @@ import ylPagination from "@/components/yl-pagination";
 import {
   getMcsOrdDck,
   getSplerMcsDelvOrdPage,
-  selectSpdList
+  selectSpdList,
 } from "@/api/orderManage-sup/index";
 export default {
   components: {
@@ -253,34 +260,34 @@ export default {
   },
   data() {
     return {
-      activeNametree:"org",
-      data:[],
-      spdId:null,
+      activeNametree: "org",
+      data: [],
+      spdId: null,
       defaultProps: {
         children: "children",
         label: "spdName",
       },
-      activeName:"first",
+      activeName: "first",
       listQuery: {
         current: 1,
         size: 10,
         id: "",
-        branchName:"",
+        branchName: "",
         docmkDateStart: "",
         docmkDateEnd: "",
         docmkDate: [],
         stas: "",
-        spdId:"",
+        spdId: "",
       },
       listQueryC: {
         current: 1,
         size: 10,
-        purcOrdId:"",
-        branchName:"",
-        docmkDate:"",
-        delvOrdId:"",
-        docmkDateEnd:"",
-        branchName:"",
+        purcOrdId: "",
+        branchName: "",
+        docmkDate: "",
+        delvOrdId: "",
+        docmkDateEnd: "",
+        branchName: "",
       },
       stasOptions: [
         // {value: 'A', lable: "未受理"},
@@ -293,14 +300,14 @@ export default {
       ],
       listLoading: false,
       list: [],
-      listC:[],
+      listC: [],
       total: 0,
-      totalC:0,
+      totalC: 0,
     };
   },
   mounted() {
     this.getData();
-    if (this.$route.query.spdId && this.$route.query.activeName =='first') {
+    if (this.$route.query.spdId && this.$route.query.activeName == "first") {
       this.listQuery.spdId = this.$route.query.spdId;
       getMcsOrdDck(this.listQuery)
         .then((res) => {
@@ -311,9 +318,9 @@ export default {
         .catch((err) => {
           this.listLoading = false;
         });
-    };
-    if (this.$route.query.spdId && this.$route.query.activeName =='second') {
-      this.activeName='second'
+    }
+    if (this.$route.query.spdId && this.$route.query.activeName == "second") {
+      this.activeName = "second";
       this.listQueryC.spdId = this.$route.query.spdId;
       getSplerMcsDelvOrdPage(this.listQueryC)
         .then((res) => {
@@ -324,7 +331,7 @@ export default {
         .catch((err) => {
           this.listLoading = false;
         });
-    };
+    }
   },
   methods: {
     tabClick(tab) {
@@ -355,15 +362,14 @@ export default {
           this.data = res.data;
           console.log(this.data, "dadad");
         })
-        .catch((err) => {
-        });
+        .catch((err) => {});
     },
     getOutboundData(type) {
       if (type == "search") {
         this.listQuery.current = 1;
       }
       this.listLoading = true;
-      this.listQuery.spdId=this.spdId
+      this.listQuery.spdId = this.spdId;
       this.listQuery.docmkDateStart = this.listQuery.docmkDate[0];
       this.listQuery.docmkDateEnd = this.listQuery.docmkDate[1];
       getMcsOrdDck(this.listQuery)
@@ -404,23 +410,23 @@ export default {
       this.$router.push({
         name: "deliveryDetail",
         query: {
-          deptName:row.deptName,
-          deptId:row.deptId,
+          deptName: row.deptName,
+          deptId: row.deptId,
           id: row.id,
           detlCnt: row.detlCnt,
-          qtySum:row.qtySum,
-          purcAmt:row.purcAmt,
+          qtySum: row.qtySum,
+          purcAmt: row.purcAmt,
           docmker: row.docmker,
           docmkDate: row.docmkDate,
           stas: row.stas,
-          branchName:row.branchName,
-          spdId:this.spdId,
-          activeName:this.activeName,
-          oprn:row.oprn,
-          oprtRoom:row.oprtRoom,
-          oprtTime:row.oprtTime,
-          atddr:row.atddr,
-          purcType:row.purcType,
+          branchName: row.branchName,
+          spdId: this.spdId,
+          activeName: this.activeName,
+          oprn: row.oprn,
+          oprtRoom: row.oprtRoom,
+          oprtTime: row.oprtTime,
+          atddr: row.atddr,
+          purcType: row.purcType,
         },
       });
     },
@@ -455,19 +461,19 @@ export default {
           purcOrdId: row.purcOrdId,
           detlCnt: row.detlCnt,
           docmker: row.docmker,
-          deptName:row.deptName,
+          deptName: row.deptName,
           docmkDate: row.docmkDate,
           delvOrdStas: row.delvOrdStas,
-          branchName:row.branchName,
-          qtySum:row.qtySum,
-          spdId:this.spdId,
-          activeName:this.activeName,
-          purcAmt:row.purcAmt,
-          oprn:row.oprn,
-          oprtRoom:row.oprtRoom,
-          oprtTime:row.oprtTime,
-          atddr:row.atddr,
-          purcType:row.purcType,
+          branchName: row.branchName,
+          qtySum: row.qtySum,
+          spdId: this.spdId,
+          activeName: this.activeName,
+          purcAmt: row.purcAmt,
+          oprn: row.oprn,
+          oprtRoom: row.oprtRoom,
+          oprtTime: row.oprtTime,
+          atddr: row.atddr,
+          purcType: row.purcType,
         },
       });
     },
@@ -476,12 +482,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.custom-tree-node{
+.custom-tree-node {
   display: flex;
   flex-direction: row;
   justify-content: space-between;
 }
-.custom-tree-node ::v-deep .redTit{
+.custom-tree-node ::v-deep .redTit {
   min-width: 30px;
   background-color: #f56c6c;
   min-height: 1px;

src/views/page/procurement-settlement/invoiceManage/consumptionDetail.vue

@@ -256,7 +256,7 @@ export default {
         { value: "1", lable: "集采" },
       ],
       listLoading: false,
-      list: [{prodName:"q",amt:"1"},{prodName:"v",amt:"3"},{prodName:"w",amt:"2"}],
+      list: [],
       isShow: false,
       sureLoading: false,
       printLoading: false, 

src/views/page/procurement-settlement/reconciliation/supplierDetail.vue

@@ -1,12 +1,14 @@
 <template>
   <!-- 商品退货管理————待确认 -->
   <div>
-    <div class="right-button">
+    <el-card>
+    <div style="text-align:right">
       <el-button type="primary" v-print="printObj">打印</el-button>
       <el-button type="primary" v-if="isShow" @click="handleConfirm" :loading="sureLoading"
         >确 认</el-button
       >
     </div>
+    </el-card>
     <div class="common-card">
       <h3>基本信息</h3>
       <el-form
@@ -328,5 +330,13 @@ export default {
     margin-left: 94%;
  }
 }
+.el-card{
+   ::v-deep .el-card__body{
+    padding:10px 0px 10px 0px;
+    border: none;
+    margin-right: 20px;
+  }
+}
+
 
 </style>