问题修复

src/views/components/mcs-info.vue

@@ -1,9 +1,10 @@
 <template>
   <div class="mcs-name">
     <span v-if="info.prodName">{{ info.prodName }}</span>
-    <el-tag v-if="info.mcsType == '0'" > 普通耗材 </el-tag>
-    <el-tag v-if="info.mcsType == '1'" > 高值耗材 </el-tag>
-    <el-tag v-if="info.mcsType == '2'" > 试剂 </el-tag>
+    <el-tag v-if="info.mcsType == '0'"> 普通耗材 </el-tag>
+    <el-tag v-if="info.mcsType == '1'"> 高值耗材 </el-tag>
+    <el-tag v-if="info.mcsType == '2'"> 试剂 </el-tag>
+    <el-tag v-if="info.mcsType == '3'"> 总务耗材 </el-tag>
     <br />
 
     注册证号：
@@ -43,5 +44,4 @@ export default {
 };
 </script>
 
-<style>
-</style>
+<style></style>

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

@@ -2,7 +2,12 @@
   <!-- 退货 -->
   <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-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-tabs>
@@ -23,10 +28,19 @@
     <div class="right-common-box">
       <el-form :model="listQuery" ref="queryForm" :inline="true">
         <el-form-item label="模板名称" prop="tmplName">
-          <el-input v-model="listQuery.tmplName" placeholder="请输入模板名称"></el-input>
+          <el-input
+            v-model="listQuery.tmplName"
+            placeholder="请输入模板名称"
+          ></el-input>
         </el-form-item>
         <el-form-item label="适用手术" prop="oprn">
-          <el-select v-model="listQuery.oprn" placeholder="请选择适用手术" clearable filterable remote>
+          <el-select
+            v-model="listQuery.oprn"
+            placeholder="请选择适用手术"
+            clearable
+            filterable
+            remote
+          >
             <el-option
               v-for="item in oprnOptions"
               :key="item.value"
@@ -36,7 +50,13 @@
           </el-select>
         </el-form-item>
         <el-form-item label="适用科室" prop="dept">
-          <el-select v-model="listQuery.dept" placeholder="请选择适用科室" clearable filterable remote>
+          <el-select
+            v-model="listQuery.dept"
+            placeholder="请选择适用科室"
+            clearable
+            filterable
+            remote
+          >
             <el-option
               v-for="item in deptOptions"
               :key="item.id"
@@ -57,7 +77,9 @@
           />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="getorderData('search')">查询 </el-button>
+          <el-button type="primary" @click="getorderData('search')"
+            >查询
+          </el-button>
           <el-button @click="reset">重置</el-button>
         </el-form-item>
       </el-form>
@@ -91,8 +113,13 @@
         <el-table-column label="制作时间" prop="crteTime" />
         <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 type="text" @click="handleDetail(scope.row)"
+              >编辑</el-button
+            >
+            <el-button
+              type="text"
+              style="color: red"
+              @click="handleDel(scope.row)"
               >删除</el-button
             >
           </template>
@@ -116,11 +143,11 @@ import { selectSpdList } from "@/api/orderManage-sup/index";
 import {
   getBoneTemplatePage,
   updateBoneTemplate,
-  selectDeptList,
+  selectDeptList
 } from "@/api/mainrTenance-sup/index";
 export default {
   components: {
-    ylPagination,
+    ylPagination
   },
   data() {
     return {
@@ -130,7 +157,7 @@ export default {
       spdId: null,
       defaultProps: {
         children: "children",
-        label: "spdName",
+        label: "spdName"
       },
       listQuery: {
         current: 1,
@@ -141,11 +168,11 @@ export default {
         lstUpdUsrName: [],
         dateStart: "",
         dateEnd: "",
-        spdId: "",
+        spdId: ""
       },
       stasOptions: [
         { value: "A", lable: "待确认" },
-        { value: "B", lable: "已确认" },
+        { value: "B", lable: "已确认" }
       ],
       listLoading: false,
       list: [],
@@ -153,10 +180,10 @@ export default {
       oprnOptions: [
         { value: "头部手术", label: "头部手术" },
         { value: "颈部手术", label: "颈部手术" },
-        { value: "骨科手术", label: "骨科手术" },
+        { value: "骨科手术", label: "骨科手术" }
       ],
       deptOptions: [],
-      routespdId: "",
+      routespdId: ""
     };
   },
   mounted() {
@@ -176,7 +203,7 @@ export default {
       //     this.listLoading = false;
       //   });
     }
-    selectDeptList({ deptName: "" }).then((res) => {
+    selectDeptList({ deptName: "" }).then(res => {
       this.deptOptions = res.data;
     });
   },
@@ -197,20 +224,20 @@ export default {
       this.spdId = data.spdId;
       this.listQuery.spdId = this.spdId;
       getBoneTemplatePage(this.listQuery)
-        .then((res) => {
+        .then(res => {
           this.list = res.data.records;
           this.total = res.data.total;
           this.listLoading = false;
           this.btnShow = true;
-          this.list.forEach((v) => {
-            this.deptOptions.forEach((i) => {
+          this.list.forEach(v => {
+            this.deptOptions.forEach(i => {
               if (v.dept == i.id) {
                 v.dept = i.deptName;
               }
             });
           });
         })
-        .catch((err) => {
+        .catch(err => {
           this.listLoading = false;
         });
     },
@@ -218,11 +245,11 @@ export default {
     getData(type) {
       this.data = [];
       selectSpdList()
-        .then((res) => {
+        .then(res => {
           this.listQuery.spdId = res.data[0].spdId;
           this.data = res.data;
         })
-        .catch((err) => {});
+        .catch(err => {});
     },
     getorderData(type) {
       if (type == "search") {
@@ -232,19 +259,19 @@ export default {
       this.listQuery.dateEnd = this.listQuery.lstUpdUsrName[1];
       this.listLoading = true;
       getBoneTemplatePage(this.listQuery)
-        .then((res) => {
+        .then(res => {
           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) => {
+        .catch(err => {
           this.listLoading = false;
         });
     },
@@ -270,8 +297,8 @@ export default {
           dept: row.dept,
           id: row.id,
           crteUsrName: row.crteUsrName,
-          tmplNo: row.tmplNo,
-        },
+          tmplNo: row.tmplNo
+        }
       });
     },
     handleAdd() {
@@ -283,8 +310,8 @@ export default {
       this.$router.push({
         name: "indexDetail",
         query: {
-          spdId: this.routespdId,
-        },
+          spdId: this.routespdId
+        }
       });
     },
     // 删除
@@ -292,22 +319,22 @@ export default {
       this.$confirm("确认删除", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning",
+        type: "warning"
       })
         .then(() => {
           updateBoneTemplate({ tmplNo: row.tmplNo, splerId: row.splerId })
-            .then((response) => {
+            .then(response => {
               this.$message({
                 message: "删除成功",
-                type: "success",
+                type: "success"
               });
               this.getorderData();
             })
-            .catch((err) => {});
+            .catch(err => {});
         })
         .catch(() => {});
-    },
-  },
+    }
+  }
 };
 </script>
 

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

@@ -281,6 +281,7 @@
           :reserve-selection="true"
           :selectable="selected"
         />
+        <el-table-column fixed type="index" label="序号" width="60" />
         <el-table-column label="耗材信息" prop="prodName" width="300">
           <template slot-scope="scope">
             <mcs-info :info="scope.row"></mcs-info>

src/views/page/orderManage-sup/alreadyDelivery/alreadyDetail.vue

@@ -602,20 +602,38 @@ export default {
         }
       }
     },
+    rowSpan(columnIndex) {
+      let cond;
+      if (this.$route.query.purcType == "2") {
+        cond =
+          columnIndex === 1 ||
+          columnIndex === 2 ||
+          columnIndex === 3 ||
+          columnIndex === 4 ||
+          columnIndex === 5 ||
+          columnIndex === 6 ||
+          columnIndex === 7 ||
+          columnIndex === 8 ||
+          columnIndex === 10 ||
+          columnIndex === 11;
+      } else {
+        cond =
+          columnIndex === 1 ||
+          columnIndex === 2 ||
+          columnIndex === 3 ||
+          columnIndex === 4 ||
+          columnIndex === 5 ||
+          columnIndex === 6 ||
+          columnIndex === 7 ||
+          columnIndex === 8 ||
+          columnIndex === 12 ||
+          columnIndex === 13;
+      }
+      return cond;
+    },
     // 合并列
     handleSpan({ row, column, rowIndex, columnIndex }) {
-      if (
-        columnIndex === 1 ||
-        columnIndex === 2 ||
-        columnIndex === 3 ||
-        columnIndex === 4 ||
-        columnIndex === 5 ||
-        columnIndex === 6 ||
-        columnIndex === 7 ||
-        columnIndex === 8 ||
-        columnIndex === 12 ||
-        columnIndex === 13
-      ) {
+      if (this.rowSpan(columnIndex)) {
         // console.log("单元格数组，若下一项为0，则代表合并上一项", this.cellList);
         const rowCell = this.cellList[rowIndex];
         if (rowCell > 0) {

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

@@ -197,6 +197,9 @@
               </el-form-item>
             </template>
           </el-table-column>
+          <el-table-column label="需求数量" prop="purcCnt" />
+          <el-table-column label="已出库数量" prop="delvCntYck" width="90px" />
+          <el-table-column label="剩余出库量" prop="toDelvCnt" width="90px" />
           <el-table-column label="生产日期" prop="manuDate" width="220"  v-if="!cShow">
             <template slot-scope="scope">
               <el-form-item
@@ -237,9 +240,6 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="需求数量" prop="purcCnt" />
-          <el-table-column label="已出库数量" prop="delvCntYck" width="90px" />
-          <el-table-column label="剩余出库量" prop="toDelvCnt" width="90px" />
           <el-table-column label="本次出库数量" prop="delvCnt" width="150">
               <template slot-scope="scope">
                   <el-form-item
@@ -598,6 +598,7 @@ export default {
       confirmLoad: false,
       endLoad: false,
       number: [],
+      isLotnum: false, //批号是否有重复
       orderData: [], //出库单打印数据
       lotNumRule: [
         {
@@ -1064,7 +1065,6 @@ export default {
     // 合并列
     handleSpan({ row, column, rowIndex, columnIndex }) {
       if (
-        columnIndex === 1 ||
         columnIndex === 2 ||
         columnIndex === 3 ||
         columnIndex === 4 ||
@@ -1072,9 +1072,10 @@ export default {
         columnIndex === 6 ||
         columnIndex === 7 ||
         columnIndex === 8 ||
+        columnIndex === 9 ||
+        columnIndex === 11 ||
         columnIndex === 12 ||
-        columnIndex === 13 ||
-        columnIndex === 14
+        columnIndex === 13
       ) {
         // console.log("单元格数组，若下一项为0，则代表合并上一项", this.cellList);
         const rowCell = this.cellList[rowIndex];
@@ -1094,22 +1095,6 @@ export default {
           };
         }
       }
-
-      // if (columnIndex === 2 && rowIndex == 0) {
-      //     return {
-      //         rowspan: this.pos,
-      //         colspan: 1
-      //     };
-      // }else{
-      //     for(let i=1;i<this.pos;i++){
-      //         if(rowIndex === this.pos-i && columnIndex == 2){
-      //             return {
-      //                 rowspan: 0,
-      //                 colspan: 0
-      //             };
-      //         }
-      //     }
-      // }
     },
     //删除
     handleDelete(row, i) {
@@ -1356,13 +1341,19 @@ export default {
         });
         return;
       }
-      let lotnum = this.pf(this.multipleSelection);
-      if (lotnum == true) {
+      let obj = {};
+      let reduce = this.multipleSelection.reduce((curr, next) => {
+        obj[next.prodCode + next.lotNum]
+          ? ""
+          : (obj[next.prodCode + next.lotNum] = curr.push(next));
+        return curr;
+      }, []);
+      if (reduce.length !== this.multipleSelection.length) {
         this.$message({
           message: "同一产品的批号不能重复",
           type: "info",
         });
-        throw new Error("同一产品的批号不能重复");
+        return;
       }
       this.multipleSelection.forEach((item) => {
         if (item.delvCnt == "0") {
@@ -1434,7 +1425,9 @@ export default {
                 form: JSON.stringify({
                   ...this.listForm,
                   delvOrdId: res.data.id,
-                  quit:"outbound"
+                  docmker: res.data.docmker,
+                  docmkDate: res.data.docmkDate,
+                  quit: "outbound",
                 }),
                 data: JSON.stringify(this.multipleSelection),
               },

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

@@ -318,7 +318,8 @@ export default {
       },
       stasOptions: [
         { value: "B", lable: "待录入发票" },
-        { value: "C", lable: "已录入发票" }
+        { value: "C", lable: "已录入发票" },
+        { value: "R", lable: "已撤回" }
       ],
       isFasOptions: [
         { value: "0", lable: "非集采" },
@@ -381,7 +382,7 @@ export default {
     };
   },
   created() {
-    if (this.$route.query.stas == "B") {
+    if (this.$route.query.stas == "B" || this.$route.query.stas == "R") {
       this.isShow = true;
     } else {
       this.isShow = false;

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

@@ -299,7 +299,8 @@ export default {
           stas: row.stas,
           spdId: this.routespdId,
           activeNameTab: this.activeNameTab,
-          detlCnt: row.detlCnt
+          detlCnt: row.detlCnt,
+          invoFile: JSON.stringify(row.invoFile)
         }
       });
     },

src/views/page/productreturnmanage-sup/returnOrderAccept/returnDetail.vue

@@ -113,11 +113,12 @@
           </el-table-column>
           <el-table-column label="退货数量" prop="retnCnt" />
           <el-table-column label="退货金额" prop="retnAmt" />
+          <el-table-column label="退货原因" prop="rejtRea" />
         </el-table>
         <!-- <p class="price-css">合计数量：{{}} <span></span>合计金额： {{}}</p> -->
       </el-form>
     </div>
-    <div class="common-card">
+    <!-- <div class="common-card">
       <h3>退货原因</h3>
       <el-form
         :model="listForm"
@@ -133,7 +134,7 @@
           </div>
         </div>
       </el-form>
-    </div>
+    </div> -->
     <div class="foot-button">
       <el-button type="primary" @click="handleConfirm" :loading="sureLoading"
         >确 认</el-button
@@ -237,7 +238,7 @@ export default {
           id: this.$route.query.id,
           spdId: this.$route.query.spdId,
           stas: "B",
-          rejtRea: this.listForm.rejtRea
+          rejtRea: ""
         };
         acpRetnOrd(data)
           .then(res => {

src/views/page/productreturnmanage-sup/returnOrderAccept/returncomDetail.vue

@@ -113,11 +113,12 @@
           </el-table-column>
           <el-table-column label="退货数量" prop="retnCnt" />
           <el-table-column label="退货金额" prop="retnAmt" />
+          <el-table-column label="退货原因" prop="rejtRea" />
         </el-table>
         <!-- <p class="price-css">合计数量：{{}} <span></span>合计金额： {{}}</p> -->
       </el-form>
     </div>
-    <div class="common-card">
+    <!-- <div class="common-card">
       <h3>退货原因</h3>
       <el-form
         :model="listForm"
@@ -133,7 +134,7 @@
           </div>
         </div>
       </el-form>
-    </div>
+    </div> -->
     <div class="foot-button">
       <el-button type="info" @click="handleBack">返回</el-button>
     </div>

src/views/page/qualityManagement-sup/information-filling/index.vue

@@ -385,6 +385,7 @@
             </yl-upload>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="memo" width="150" />
         <el-table-column
           label="操作"
           width="150"
@@ -477,6 +478,9 @@
             >
           </yl-upload>
         </el-form-item>
+        <el-form-item label="备注" prop="memo">
+          <el-input v-model.trim="temp.memo" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible = false">取消</el-button>
@@ -527,7 +531,8 @@ export default {
         issuDate: "",
         endDate: "",
         fileId: "",
-        type: ""
+        type: "",
+        memo: ""
       }
     };
   },