采购订单出库 耗材编码字段修改

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

@@ -23,11 +23,11 @@
               placeholder="请输入耗材编码"
             ></el-input>
           </el-form-item> -->
-        <el-form-item size="mini" label="医保编码" prop="hiCode" class="long">
+        <!-- <el-form-item size="mini" label="医保编码" prop="hiCode" class="long">
           <el-input v-model="listQuery.hiCode" placeholder="请输入医保编码"></el-input>
-        </el-form-item>
-        <el-form-item size="mini" label="耗材名称" prop="prodName" class="long">
-          <el-input v-model="listQuery.prodName" placeholder="请输入耗材名称"></el-input>
+        </el-form-item> -->
+        <el-form-item size="mini" label="耗材信息" prop="prodName" class="long">
+          <el-input v-model="listQuery.prodName" placeholder="请输入耗材名称/医保编码"></el-input>
         </el-form-item>
         <el-form-item size="mini" label="规格" prop="spec" class="long">
           <el-input v-model="listQuery.spec" placeholder="请输入规格"></el-input>
@@ -379,7 +379,7 @@
           <el-table-column prop="prodSouc" label="生产来源">
             <template #default="{ row }">
               <span v-if="row.prodSouc == '1'">国产</span>
-              <span v-if="row.prodSouc == '0'">进口</span>
+              <span v-if="row.prodSouc == '2'">进口</span>
             </template>
           </el-table-column>
           <el-table-column prop="regcertno" label="注册证号"> </el-table-column>
@@ -534,7 +534,7 @@ export default {
       ],
       SoucData: [
         { value: "1", name: "国产" },
-        { value: "0", name: "进口" },
+        { value: "2", name: "进口" },
       ],
       statusData: [
         { value: "A", name: "待提交" },

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

@@ -17,11 +17,11 @@
     </el-card>
     <div class="right-common-box">
       <el-form :model="listQuery" ref="listQuery" :inline="true" label-width="90px">
-        <el-form-item size="mini" label="医保编码" prop="hiCode" class="long">
+        <!-- <el-form-item size="mini" label="医保编码" prop="hiCode" class="long">
           <el-input v-model="listQuery.hiCode" placeholder="请输入医保编码"></el-input>
-        </el-form-item>
-        <el-form-item size="mini"  label="耗材名称" prop="prodName" class="long">
-          <el-input v-model="listQuery.prodName" placeholder="请输入耗材名称"></el-input>
+        </el-form-item> -->
+        <el-form-item size="mini"  label="耗材信息" prop="prodName" class="long">
+          <el-input v-model="listQuery.prodName" placeholder="请输入耗材名称/医保编码"></el-input>
         </el-form-item>
         <el-form-item size="mini" label="规格" prop="spec" class="long">
           <el-input v-model="listQuery.spec" placeholder="请输入规格"></el-input>
@@ -367,7 +367,7 @@
           <el-table-column prop="prodSouc" label="生产来源">
             <template #default="{ row }">
               <span v-if="row.prodSouc == '1'">国产</span>
-              <span v-if="row.prodSouc == '0'">进口</span>
+              <span v-if="row.prodSouc == '2'">进口</span>
             </template>
           </el-table-column>
           <el-table-column prop="regcertno" label="注册证号"> </el-table-column>
@@ -431,7 +431,7 @@ export default {
         current: 1,
         size: 10,
         spec: "",
-        hiCode: "",
+        // hiCode: "",
         isFas: "",
         mol: "",
         prodSouc: "",
@@ -464,7 +464,7 @@ export default {
       ],
       SoucData: [
         { value: "1", name: "国产" },
-        { value: "0", name: "进口" },
+        { value: "2", name: "进口" },
       ],
       statusData: [
         { value: "A", name: "待提交" },

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

@@ -109,7 +109,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">

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

@@ -160,6 +160,7 @@
             <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 == 'C'">已出库</span>
                 <span v-if="row.stas == 'D'">部分出库</span>

src/views/page/orderManage-sup/purOrderConfirmed/confirmDetail.vue

@@ -107,7 +107,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">

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

@@ -225,7 +225,7 @@
           <el-table-column label="报关单" prop="invoFileId" width="200">
             <template slot-scope="scope">
               <yl-upload
-                v-if="scope.row.prodSouc=='进口'"
+                v-if="scope.row.prodSouc=='2'"
                 :fileId="scope.row.invoFileId"
                 @getUpload="getUpload1"
                 urlName="acco"
@@ -829,7 +829,7 @@ export default {
     numAll(row) {
       let num = 0;
       this.tableData.forEach((item) => {
-        if (item.materialId == row.materialId) {
+        if (item.prodCode == row.prodCode) {
           num += item.delvCnt;
         }
       });
@@ -875,7 +875,7 @@ export default {
       this.tableData.forEach(async (item) => {
         await this.numAll(row);
         console.log(this.numAll(row), "he");
-        if (item.materialId == row.materialId) {
+        if (item.prodCode == row.prodCode) {
           if (this.numAll(row) > item.toDelvCnt) {
             this.$message.warning("出库数量不能大于待出库数量");
             row.delvCnt = 0;
@@ -961,7 +961,7 @@ export default {
           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);
@@ -986,10 +986,8 @@ export default {
         columnIndex === 8 ||
         columnIndex === 9 ||
         columnIndex === 10 ||
-        columnIndex === 11 ||
         columnIndex === 15 ||
-        columnIndex === 16 ||
-        columnIndex === 17 
+        columnIndex === 16
       ) {
         // console.log("单元格数组，若下一项为0，则代表合并上一项", this.cellList);
         const rowCell = this.cellList[rowIndex];
@@ -1028,10 +1026,10 @@ export default {
     },
     //删除
     handleDelete(row, i) {
-      const index = this.tableData.findIndex((item) => item.materialId === row.materialId);
+      const index = this.tableData.findIndex((item) => item.prodCode === row.prodCode);
       if (index !== -1) {
         let qwe = this.tableData.findIndex(function (item) {
-          return item.materialId == row.materialId;
+          return item.prodCode == row.prodCode;
         });
         this.tableData.splice(i, 1);
         this.cellList.splice(i, 1);
@@ -1158,7 +1156,7 @@ export default {
           });
           throw new Error("本次出库数量必须大于0");
         }
-         if (item.prodSouc=="进口" && !item.invoFileId) {
+         if (item.prodSouc=="2" && !item.invoFileId) {
           this.$message({
             // message: "请填写相应信息，并选择报关单和随货单",
             message: "请填写相应信息，并选择报关单",

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

@@ -28,7 +28,7 @@
           </template>
           <el-table-column fixed type="index" label="序号" width="60" />
           <el-table-column label="采购单号" prop="purcOrdId" />
-          <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">
@@ -136,7 +136,7 @@
           <el-table-column label="报关单" prop="invoFileId" width="200">
             <template slot-scope="scope">
               <yl-upload
-                v-if="scope.row.source == '进口'"
+                v-if="scope.row.prodSouc == '2'"
                 :fileId="scope.row.invoFileId"
                 @getUpload="getUpload1"
                 urlName="acco"
@@ -245,7 +245,7 @@
             width="55"
           ></el-table-column>
           <el-table-column label="采购单号" prop="purcOrdId"> </el-table-column>
-          <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">
@@ -384,11 +384,11 @@ export default {
     //删除
     handleDelete(row, i) {
       const index = this.tableData.findIndex(
-        (item) => item.materialId === row.materialId
+        (item) => item.prodCode === row.prodCode
       );
       if (index !== -1) {
         let qwe = this.tableData.findIndex(function (item) {
-          return item.materialId == row.materialId;
+          return item.prodCode == row.prodCode;
         });
         this.tableData.splice(i, 1);
         this.cellList.splice(i, 1);
@@ -450,7 +450,7 @@ export default {
           });
           throw new Error("本次出库数量必须大于0");
         }
-        if (item.prodSouc == "进口" && !item.invoFileId) {
+        if (item.prodSouc == "2" && !item.invoFileId) {
           this.$message({
             message: "请填写相应信息，并选择报关单",
             type: "warning",
@@ -596,7 +596,7 @@ export default {
     numAll(row) {
       let num = 0;
       this.tableData.forEach((item) => {
-        if (item.materialId == row.materialId) {
+        if (item.prodCode == row.prodCode) {
           num += item.delvCnt;
         }
       });
@@ -606,7 +606,7 @@ export default {
       this.tableData.forEach(async (item) => {
         await this.numAll(row);
         console.log(this.numAll(row), "he");
-        if (item.materialId == row.materialId) {
+        if (item.prodCode == row.prodCode) {
           if (this.numAll(row) > item.toDelvCnt) {
             this.$message.warning("出库数量不能大于待出库数量");
             row.delvCnt = 0;