生产日期的校验 有效期

src/components/yl-upload/index.vue

@@ -167,7 +167,9 @@ export default {
           const a = res.data.fileContent;
           this.type = res.data.fileSufx;
           // 打开pdf
-          if (res.data.fileSufx === "pdf") {
+          const fileName = res.data.fileName.split(".").slice(-1);
+          if(fileName){
+          // if (res.data.fileSufx === "pdf") {
             console.log(222)
             const b = this.dataURLtoBlob(res.data.fileContent.slice(28));
             console.log(b,"bb")

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

@@ -227,14 +227,14 @@
             </el-form-item>
           </div>
           <div class="flex-css">
-            <el-form-item label="集采批次" prop="fasBtch">
+            <el-form-item label="带量批次" prop="fasBtch">
               <div class="content" v-if="isShow">
                 {{infoData.fasBtch}}
               </div>
               <el-input
                 v-else
                 v-model="infoData.fasBtch"
-                placeholder="请输入集采批次"
+                placeholder="请输入带量批次"
               ></el-input>
             </el-form-item>
             <el-form-item label="是否寄售" prop="isCgmt" :rules="rules.selectRequired">

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

@@ -160,10 +160,10 @@
             </el-form-item>
           </div>
           <div class="flex-css">
-            <el-form-item label="集采批次" prop="fasBtch">
+            <el-form-item label="带量批次" prop="fasBtch">
               <el-input
                 v-model="infoData.fasBtch"
-                placeholder="请输入集采批次"
+                placeholder="请输入带量批次"
                 maxlength="50"
               ></el-input>
             </el-form-item>
@@ -410,6 +410,7 @@ export default {
           this.saveLoad = true;
           this.infoData.spdId = this.$route.query.spdId;
           this.infoData.status = "A";
+          this.infoData.opeType = "新增";
           insertSplerMcsList(this.infoData)
             .then((response) => {
               this.$message({

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

@@ -49,8 +49,8 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <!-- <el-form-item label="集采批次" prop="fasBtch" class="long">
-            <el-input v-model="listQuery.fasBtch" placeholder="请输入集采批次"></el-input>
+        <!-- <el-form-item label="带量批次" prop="fasBtch" class="long">
+            <el-input v-model="listQuery.fasBtch" placeholder="请输入带量批次"></el-input>
           </el-form-item> -->
         <el-form-item size="mini" label="耗材类别" prop="mcsType" class="long">
           <el-select v-model="listQuery.mcsType" placeholder="请选择耗材类别" clearable>
@@ -367,7 +367,7 @@
               <span v-if="row.isFas == '0'">是</span>
             </template>
           </el-table-column>
-          <el-table-column prop="fasBtch" label="集采批次"> </el-table-column>
+          <el-table-column prop="fasBtch" label="带量批次"> </el-table-column>
           <!-- <el-table-column prop="splb" label="商品类别">
             </el-table-column>
             <el-table-column prop="spfl" label="商品分类">

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

@@ -355,7 +355,7 @@
               <span v-if="row.isFas == '0'">是</span>
             </template>
           </el-table-column>
-          <el-table-column prop="fasBtch" label="集采批次"> </el-table-column>
+          <el-table-column prop="fasBtch" label="带量批次"> </el-table-column>
           <!-- <el-table-column prop="splb" label="商品类别">
           </el-table-column>
           <el-table-column prop="spfl" label="商品分类">

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

@@ -119,7 +119,7 @@
                     <p>暂无数据</p>
                 </template>
                 <el-table-column fixed type="index" label="序号" width="60"/>
-                <el-table-column label="耗材编码" prop="materialId" />
+                <el-table-column label="耗材编码" prop="prodCode" />
                 <el-table-column label="医保编码" prop="hiCode" />
                 <el-table-column label="耗材信息" width="300">
                     <template slot-scope="scope">
@@ -429,7 +429,7 @@ import { getOrdDetlList,finishDelvOrd } from "@/api/orderManage-sup/index";
                         console.log("索引", 0, this.count);
                     } else {
                         // 判断当前项与上项的设备类别是否相同，因为是合并这一列的单元格
-                        if (tableData[i].materialId == tableData[i - 1].materialId) {
+                        if (tableData[i].prodCode == tableData[i - 1].prodCode) {
                             this.cellList[this.count] += 1; // 增加计数
                             this.cellList.push(0); // 相等就往cellList数组中追加0
                             console.log("索引", i, this.count);

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

@@ -133,23 +133,33 @@
           <el-table-column label="采购数量" prop="purcCnt" />
           <el-table-column label="采购价" prop="purcPric" />
           <el-table-column label="总金额" prop="purcAmt" />
-          <el-table-column label="备注" prop="memo" />
-          <el-table-column label="驳回原因" prop="memo" width="200">
+          <el-table-column label="驳回原因" prop="rejtRea" width="200">
                     <template slot-scope="scope">
                         <el-form-item
                             label-width="0"
                             class="item"
-                            :prop="scope.$index + '.memo'"
+                            :prop="scope.$index + '.rejtRea'"
                         >
-                            <el-input placeholder="请输入" v-model="scope.row.memo" :readonly="!returnInfo"></el-input>
+                            <el-input placeholder="请输入" v-model="scope.row.rejtRea" :readonly="!scope.row.flag"></el-input>
                         </el-form-item>
                     </template>
-                </el-table-column>
-                <el-table-column label="是否驳回" width="100">
-                    <template slot-scope="scope">
-                        <el-switch v-model="scope.row.flag" @change="handleSwitch(scope.$index,scope.row)" :disabled="!isShow"></el-switch>
-                    </template>
-                </el-table-column>
+          </el-table-column>
+          <el-table-column label="是否驳回" width="100">
+              <template slot-scope="scope">
+                  <el-switch v-model="scope.row.flag" @change="handleSwitch(scope.$index,scope.row)" :disabled="!isShow"></el-switch>
+              </template>
+          </el-table-column>
+          <el-table-column label="备注" prop="memo" width="200">
+              <template slot-scope="scope">
+                  <el-form-item
+                      label-width="0"
+                      class="item"
+                      :prop="scope.$index + '.memo'"
+                  >
+                      <el-input placeholder="请输入" v-model="scope.row.memo"></el-input>
+                  </el-form-item>
+              </template>
+          </el-table-column>
         </el-table>
       </el-form>
 
@@ -190,7 +200,6 @@ export default {
       list: [],
       aaLoad: false,
       isShow: false,
-      returnInfo: false,
       stasOptions: [
         { value: "A", lable: "未受理" },
         { value: "B", lable: "已受理" },
@@ -200,7 +209,6 @@ export default {
         { value: "Y", lable: "已入库" },
         { value: "P", lable: "部分入库" },
       ],
-      essdrugOptions: ["非基药", "基药"],
       listQuery:{
         prodEntp: "",
         isFas: "",
@@ -247,10 +255,9 @@ export default {
         .then((res) => {
           this.list = res.data;
           this.list.forEach((i) => {
-            if (i.memo) {
+            if (i.rejtRea) {
               i.flag = true;
             }
-            i.essdrugType = this.essdrugOptions[i.essdrugType * 1];
           });
           this.listLoading = false;
         })
@@ -260,27 +267,17 @@ export default {
     },
     // 是否驳回开关
     handleSwitch(index, row) {
+      console.log(row.flag);
       console.log(row);
       if (row.flag == false) {
-        row.memo = "";
-        this.returnInfo = false;
+        row.rejtRea = "";
       } else {
-        this.returnInfo = true;
       }
     },
-    // 驳回
-    handleReject(row) {
-      this.$refs.listRef.validate((valid) => {
-        if (valid) {
-        }
-      });
-    },
-    // 取消驳回
-    handleNoReject(row) {},
     // 受理
     handleAccept() {
         this.list.forEach((e) => {
-          if (e.flag == true && !e.memo) {
+          if (e.flag == true && !e.rejtRea) {
             this.$message({
               message: "选择是否驳回后请填写驳回原因",
               type: "warning",
@@ -307,9 +304,9 @@ export default {
         let arr1 =[]
         this.list.forEach((i)=>{
           if (i.flag == true) {
-            arr.push({ id: i.id, memo: i.memo, stas:"R" })
+            arr.push({ id: i.id, rejtRea: i.rejtRea,memo:i.memo, stas:"R" })
             }
-          else{ arr1.push({ id: i.id, stas:"B" })
+          else{ arr1.push({ id: i.id, stas:"B",memo:i.memo, })
           }
         })
         let data2 =  arr.concat(arr1);

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

@@ -168,7 +168,7 @@
                 <span v-if="row.stas == 'P'">部分入库</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" width="100">
+            <el-table-column label="操作" width="100" fixed="right">
               <template slot-scope="scope">
                 <el-button type="text" @click="handleDetail1(scope.row)">详情</el-button>
               </template>

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

@@ -1147,7 +1147,10 @@ export default {
     },
     // 出库
     handleDelivery() {
-      this.tableData.forEach((item) => {
+      this.$refs.tabledata.validate((valid) => {
+        if (valid) {
+          this.tableData.forEach((item) => {
+        console.log(item.manuDate)
         // console.log(item, "item");
         if (item.delvCnt=='0') {
           this.$message({
@@ -1164,9 +1167,16 @@ export default {
           });
           throw new Error("请填写相应信息，并选择报关单");
         }
+        item.manuDate = new Date(item.manuDate);
+        item.prodExpy = new Date(item.prodExpy);
+        if (item.manuDate.getTime() > item.prodExpy.getTime()) {
+          this.$message({
+            message: "生产日期不能大于有效期",
+            type: "warning",
+          });
+          throw new Error("生产日期不能大于有效期");
+        }
       });
-      this.$refs.tabledata.validate((valid) => {
-        if (valid) {
           this.$confirm("确认出库", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",