采购订单受理 出库问题修改

src/styles/global.scss

@@ -84,7 +84,7 @@ a {
 
   th.el-table__cell.is-leaf,
   td.el-table__cell {
-    border-bottom: none;
+    border-bottom: 1px solid #f3f4f5;;
   }
 
   th.gutter {

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

@@ -83,7 +83,30 @@
             </el-form>
         </div>
         <div class="common-card">
-            <h3>订单明细</h3>
+            <h3>商品明细</h3>
+            <el-form :model="listQuery" ref="listQuery" :inline="true" label-width="90px">
+      <el-form-item size="mini" label="生产企业" prop="prodEntp" class="long">
+          <el-input v-model="listQuery.prodEntp" placeholder="请输入生产企业"></el-input>
+        </el-form-item>
+
+       <el-form-item size="mini" label="是否集采" prop="isFas" class="long">
+          <el-select v-model="listQuery.isFas" placeholder="请选择是否集采" clearable>
+            <el-option
+              v-for="item in isFasData"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item size="mini" label="注册证号" prop="regcertno" class="long">
+          <el-input v-model="listQuery.regcertno" placeholder="请输入注册证号"></el-input>
+        </el-form-item>
+        <el-form-item>
+            <el-button type="primary" @click="getData()">查询</el-button>
+            <el-button @click="reset">重置</el-button>
+          </el-form-item>
+      </el-form>
             <el-table
                 :data="tableData"
                 v-loading="loding"
@@ -341,6 +364,15 @@ import { getOrdDetlList,finishDelvOrd } from "@/api/orderManage-sup/index";
                 tongTotal: 0,
                 tongIndex: "",
                 code: "",
+                listQuery:{
+                    prodEntp: "",
+                    isFas: "",
+                    regcertno: "",
+                },
+                isFasData: [
+                    { value: "0", name: "是" },
+                    { value: "1", name: "否" },
+                ],
             }
         },
         created() {
@@ -368,7 +400,11 @@ import { getOrdDetlList,finishDelvOrd } from "@/api/orderManage-sup/index";
                 this.listLoading = true;
                 let data = {
                     delvOrdId: this.$route.query.delvOrdId,
-                    purcOrdId: this.$route.query.purcOrdId
+                    purcOrdId: this.$route.query.purcOrdId,
+                    spdId:this.$route.query.spdId,
+                    prodEntp:this.listQuery.prodEntp,
+                    isFas:this.listQuery.isFas,
+                    regcertno:this.listQuery.regcertno, 
                 }
                 getOrdDetlList(data).then((res) => {
                     this.tableData = res.data;
@@ -551,6 +587,11 @@ import { getOrdDetlList,finishDelvOrd } from "@/api/orderManage-sup/index";
                 query:{spdId:this.$route.query.spdId,activeName:this.$route.query.activeName}
             });
             },
+            // 重置
+            reset(){
+                this.$refs.listQuery.resetFields();
+                this.getData()
+            }
         },
     }
 </script>

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

@@ -37,7 +37,7 @@
                 {{ listForm.purcAmt }}
               </div>
             </el-form-item>
-            <el-form-item label="医院名称" prop="branchName">
+            <el-form-item label="客户名称" prop="branchName">
               <div class="content">
                 {{ listForm.branchName }}
               </div>
@@ -72,6 +72,29 @@
     </div>
     <div class="common-card">
       <h3>商品明细</h3>
+        <el-form :model="listQuery" ref="listQuery" :inline="true" label-width="90px">
+      <el-form-item size="mini" label="生产企业" prop="prodEntp" class="long">
+          <el-input v-model="listQuery.prodEntp" placeholder="请输入生产企业"></el-input>
+        </el-form-item>
+
+       <el-form-item size="mini" label="是否集采" prop="isFas" class="long">
+          <el-select v-model="listQuery.isFas" placeholder="请选择是否集采" clearable>
+            <el-option
+              v-for="item in isFasData"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item size="mini" label="注册证号" prop="regcertno" class="long">
+          <el-input v-model="listQuery.regcertno" placeholder="请输入注册证号"></el-input>
+        </el-form-item>
+        <el-form-item>
+            <el-button type="primary" @click="getData()">查询</el-button>
+            <el-button @click="reset">重置</el-button>
+          </el-form-item>
+      </el-form>
       <el-form :model="list">
         <el-table
           v-loading="listLoading"
@@ -111,14 +134,14 @@
           <el-table-column label="采购价" prop="purcPric" />
           <el-table-column label="总金额" prop="purcAmt" />
           <el-table-column label="备注" prop="memo" />
-          <el-table-column label="驳回原因" prop="rejtRea" width="200">
+          <el-table-column label="驳回原因" prop="memo" width="200">
                     <template slot-scope="scope">
                         <el-form-item
                             label-width="0"
                             class="item"
-                            :prop="scope.$index + '.rejtRea'"
+                            :prop="scope.$index + '.memo'"
                         >
-                            <el-input placeholder="请输入" v-model="scope.row.rejtRea" :readonly="!returnInfo"></el-input>
+                            <el-input placeholder="请输入" v-model="scope.row.memo" :readonly="!returnInfo"></el-input>
                         </el-form-item>
                     </template>
                 </el-table-column>
@@ -178,6 +201,15 @@ export default {
         { value: "P", lable: "部分入库" },
       ],
       essdrugOptions: ["非基药", "基药"],
+      listQuery:{
+        prodEntp: "",
+        isFas: "",
+        regcertno: "",
+      },
+      isFasData: [
+        { value: "0", name: "是" },
+        { value: "1", name: "否" },
+      ],
     };
   },
   created() {
@@ -205,11 +237,17 @@ export default {
   methods: {
     getData() {
       this.listLoading = true;
-      getMcsDetlList({ id: this.$route.query.id })
+      getMcsDetlList(
+        { id: this.$route.query.id,
+          spdId:this.$route.query.spdId,
+          prodEntp:this.listQuery.prodEntp,
+          isFas:this.listQuery.isFas,
+          regcertno:this.listQuery.regcertno,
+        })
         .then((res) => {
           this.list = res.data;
           this.list.forEach((i) => {
-            if (i.rejtRea) {
+            if (i.memo) {
               i.flag = true;
             }
             i.essdrugType = this.essdrugOptions[i.essdrugType * 1];
@@ -224,7 +262,7 @@ export default {
     handleSwitch(index, row) {
       console.log(row);
       if (row.flag == false) {
-        row.rejtRea = "";
+        row.memo = "";
         this.returnInfo = false;
       } else {
         this.returnInfo = true;
@@ -242,7 +280,7 @@ export default {
     // 受理
     handleAccept() {
         this.list.forEach((e) => {
-          if (e.flag == true && !e.rejtRea) {
+          if (e.flag == true && !e.memo) {
             this.$message({
               message: "选择是否驳回后请填写驳回原因",
               type: "warning",
@@ -262,14 +300,14 @@ export default {
         // });
         // let data2 = data.map((i) => {
         //   if(i.flag == true){
-        //     return { id: i.id, rejtRea: i.rejtRea };
+        //     return { id: i.id, memo: i.memo };
         //   }
         // });
         let arr =[]
         let arr1 =[]
         this.list.forEach((i)=>{
           if (i.flag == true) {
-            arr.push({ id: i.id, rejtRea: i.rejtRea, stas:"R" })
+            arr.push({ id: i.id, memo: i.memo, stas:"R" })
             }
           else{ arr1.push({ id: i.id, stas:"B" })
           }
@@ -298,6 +336,11 @@ export default {
         query:{spdId:this.$route.query.spdId,activeName:this.$route.query.activeName}
       });
     },
+    // 重置
+    reset(){
+      this.$refs.listQuery.resetFields();
+      this.getData()
+    }
   },
 };
 </script>

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

@@ -56,15 +56,15 @@
             element-loading-text="加载中"
             :data="list"
             fit
-            height="500px"
             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 type="index" label="序号" width="60" />
             <el-table-column label="采购单号" prop="id" />
             <el-table-column label="采购品种" prop="detlCnt" />
             <el-table-column label="采购总数量" prop="qtySum" />
@@ -129,7 +129,7 @@
               />
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" @click="getDataC('search')">查询 </el-button>
+              <el-button type="primary" @click="getorderDataC('search')">查询 </el-button>
               <el-button @click="resetC">重置</el-button>
             </el-form-item>
           </el-form>
@@ -146,7 +146,7 @@
               <img src="@/assets/nopage.png" alt />
               <p>暂无数据</p>
             </template>
-            <el-table-column fixed type="index" label="序号" width="60" />
+            <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" />
@@ -155,20 +155,19 @@
             <el-table-column label="客户名称" prop="branchName" />
             <el-table-column label="来源部门" prop="deptName" />
             <el-table-column label="发起时间" prop="docmkDate" width="140" />
-            <!-- <el-table-column label="受理人" prop="docmker" />
-            <el-table-column label="受理时间" prop="docmkDate"  width="140" /> -->
+            <el-table-column label="受理人" prop="acper" />
+            <el-table-column label="受理时间" prop="acpDate"  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>
+                 <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>
                 <span v-if="row.stas == 'P'">部分入库</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" width="100" fixed="right">
+            <el-table-column label="操作" width="100">
               <template slot-scope="scope">
                 <el-button type="text" @click="handleDetail1(scope.row)">详情</el-button>
               </template>
@@ -180,7 +179,7 @@
             :total="totalC"
             :page.sync="listQueryC.current"
             :limit.sync="listQueryC.size"
-            @pagination="getDataC"
+            @pagination="getorderDataC"
           />
         </el-tab-pane>
       </el-tabs>
@@ -346,7 +345,7 @@ export default {
     },
     reset() {
       this.$refs.queryForm.resetFields();
-      this.getData();
+      this.getorderData();
     },
     // 详情
     handleDetail(row) {
@@ -390,7 +389,7 @@ export default {
     },
     resetC() {
       this.$refs.queryFormC.resetFields();
-      this.getDataC();
+      this.getorderDataC();
     },
     // 详情
     handleDetail1(row) {

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

@@ -37,12 +37,12 @@
                 {{ listForm.purcAmt }}
               </div>
             </el-form-item>
-            <el-form-item label="部门名称" prop="deptName">
+            <el-form-item label="来源部门" prop="deptName">
               <div class="content">
                 {{ listForm.deptName }}
               </div>
             </el-form-item>
-            <el-form-item label="医院名称" prop="branchName">
+            <el-form-item label="客户名称" prop="branchName">
               <div class="content">
                 {{ listForm.branchName }}
               </div>
@@ -70,6 +70,29 @@
     </div>
     <div class="common-card">
       <h3>商品明细</h3>
+      <el-form :model="listQuery" ref="listQuery" :inline="true" label-width="90px">
+      <el-form-item size="mini" label="生产企业" prop="prodEntp" class="long">
+          <el-input v-model="listQuery.prodEntp" placeholder="请输入生产企业"></el-input>
+        </el-form-item>
+
+       <el-form-item size="mini" label="是否集采" prop="isFas" class="long">
+          <el-select v-model="listQuery.isFas" placeholder="请选择是否集采" clearable>
+            <el-option
+              v-for="item in isFasData"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item size="mini" label="注册证号" prop="regcertno" class="long">
+          <el-input v-model="listQuery.regcertno" placeholder="请输入注册证号"></el-input>
+        </el-form-item>
+        <el-form-item>
+            <el-button type="primary" @click="getData()">查询</el-button>
+            <el-button @click="reset">重置</el-button>
+          </el-form-item>
+      </el-form>
       <el-form :model="list">
         <el-table
           v-loading="listLoading"
@@ -108,22 +131,22 @@
           <el-table-column label="总金额" prop="purcAmt" />
 
           <el-table-column label="备注" prop="memo" />
-          <el-table-column label="驳回原因" prop="rejtRea" width="200">
+          <!-- <el-table-column label="驳回原因" prop="memo" width="200">
                       <template slot-scope="scope">
                           <el-form-item
                               label-width="0"
                               class="item"
-                              :prop="scope.$index + '.rejtRea'"
+                              :prop="scope.$index + '.memo'"
                           >
-                              <el-input placeholder="请输入" v-model="scope.row.rejtRea" :readonly="!returnInfo"></el-input>
+                              <el-input placeholder="请输入" v-model="scope.row.memo" :readonly="!returnInfo"></el-input>
                           </el-form-item>
                       </template>
-                  </el-table-column>
-          <el-table-column label="是否驳回" width="100">
+                  </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>
       </el-form>
 
@@ -172,6 +195,15 @@ export default {
         { value: "P", lable: "部分入库" },
       ],
       essdrugOptions: ["非基药", "基药"],
+      listQuery:{
+        prodEntp: "",
+        isFas: "",
+        regcertno: "",
+      },
+      isFasData: [
+        { value: "0", name: "是" },
+        { value: "1", name: "否" },
+      ],
     };
   },
   created() {
@@ -198,11 +230,15 @@ export default {
   methods: {
     getData() {
       this.listLoading = true;
-      getMcsDetlList({ id: this.$route.query.id })
+      getMcsDetlList({ id: this.$route.query.id,
+        spdId:this.$route.query.spdId,
+          prodEntp:this.listQuery.prodEntp,
+          isFas:this.listQuery.isFas,
+          regcertno:this.listQuery.regcertno, })
         .then((res) => {
           this.list = res.data;
           this.list.forEach((i) => {
-            if (i.rejtRea) {
+            if (i.memo) {
               i.flag = true;
             }
             i.essdrugType = this.essdrugOptions[i.essdrugType * 1];
@@ -217,7 +253,7 @@ export default {
     handleSwitch(index, row) {
       console.log(row);
       if (row.flag == false) {
-        row.rejtRea = "";
+        row.memo = "";
         this.returnInfo = false;
       } else {
         this.returnInfo = true;
@@ -235,7 +271,7 @@ export default {
     // 受理
     handleAccept() {
       this.list.forEach((e) => {
-        if (e.flag == true && !e.rejtRea) {
+        if (e.flag == true && !e.memo) {
           this.$message({
             message: "选择是否驳回后请填写驳回原因",
             type: "warning",
@@ -254,7 +290,7 @@ export default {
           }
         });
         let data2 = data.map((i) => {
-          return { id: i.id, rejtRea: i.rejtRea };
+          return { id: i.id, memo: i.memo };
         });
         let data3 = {
           id: this.$route.query.id,
@@ -278,6 +314,11 @@ export default {
         query:{spdId:this.$route.query.spdId,activeName:this.$route.query.activeName}
       });
     },
+    // 重置
+    reset(){
+      this.$refs.listQuery.resetFields();
+      this.getData()
+    }
   },
 };
 </script>

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

@@ -42,12 +42,12 @@
               </div>
             </el-form-item>
            
-            <el-form-item label="部门名称" prop="deptName">
+            <el-form-item label="来源部门" prop="deptName">
               <div class="content">
                 {{ listForm.deptName }}
               </div>
             </el-form-item>
-            <el-form-item label="医院名称" prop="branchName">
+            <el-form-item label="客户名称" prop="branchName">
               <div class="content">
                 {{ listForm.branchName }}
               </div>
@@ -77,6 +77,29 @@
     </div>
     <div class="common-card">
       <h3>商品明细</h3>
+      <el-form :model="listQuery" ref="listQuery" :inline="true" label-width="90px">
+      <el-form-item size="mini" label="生产企业" prop="prodEntp" class="long">
+          <el-input v-model="listQuery.prodEntp" placeholder="请输入生产企业"></el-input>
+        </el-form-item>
+
+       <el-form-item size="mini" label="是否集采" prop="isFas" class="long">
+          <el-select v-model="listQuery.isFas" placeholder="请选择是否集采" clearable>
+            <el-option
+              v-for="item in isFasData"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item size="mini" label="注册证号" prop="regcertno" class="long">
+          <el-input v-model="listQuery.regcertno" placeholder="请输入注册证号"></el-input>
+        </el-form-item>
+        <el-form-item>
+            <el-button type="primary" @click="getData()">查询</el-button>
+            <el-button @click="reset">重置</el-button>
+          </el-form-item>
+      </el-form>
       <el-form :model="tableData" ref="tabledata">
         <el-table
           :data="tableData"
@@ -90,7 +113,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">
@@ -109,7 +132,7 @@
           <el-table-column label="计价单位" prop="prcUnt" />
           <el-table-column label="采购单位" prop="purcUnt" />
           <el-table-column label="包装内数量" prop="convrat" />
-          <el-table-column label="单价" prop="purcPric" />
+          <!-- <el-table-column label="单价" prop="purcPric" /> -->
           <el-table-column label="批号" prop="lotNum" width="120">
             <template slot-scope="scope">
               <el-form-item
@@ -419,7 +442,7 @@
             <th>生产来源</th>
             <th>注册证号</th>
             <th>生产企业</th>
-            <th>单价</th>
+            <!-- <th>单价</th> -->
             <th>批号</th>
             <th>生产日期</th>
             <th>有效期至</th>
@@ -467,9 +490,9 @@
             <td align="center">
               {{ item.prodEntp }}
             </td>
-            <td align="center">
+            <!-- <td align="center">
               {{ item.purcPric }}
-            </td>
+            </td> -->
             <td align="center">
               {{ item.lotNum }}
             </td> 
@@ -495,7 +518,7 @@
           </tr>
           <tr class="hang">
             <th align="left" :colspan="6" >合计</th>
-            <td :colspan="13" align="left">
+            <td :colspan="12" align="left">
               {{ moneySum | toChineseAmount }}
             </td>
             <!-- <td align="center"> -->
@@ -504,13 +527,13 @@
           </tr>
           <tr class="hang">
             <th :colspan="6" align="left">发货金额（人民币）大写：</th>
-            <td :colspan="13">
+            <td :colspan="12">
               {{ moneySum | toChineseAmount }}
             </td>
           </tr>
           <tr height="50px">
             <th :colspan="6" align="left">备注：</th>
-            <td :colspan="13"></td>
+            <td :colspan="12"></td>
           </tr>
           <!-- <tr class="hang">
             <th align="left" :colspan="6">收货人：</th>
@@ -633,6 +656,15 @@ export default {
       fileIndex:null,
       fileIndex1:null,
       endBtn:false,
+      listQuery:{
+          prodEntp: "",
+          isFas: "",
+          regcertno: "",
+      },
+      isFasData: [
+          { value: "0", name: "是" },
+          { value: "1", name: "否" },
+      ],
     };
   },
   created() {
@@ -748,7 +780,11 @@ export default {
   methods: {
     getData() {
       this.listLoading = true;
-      getMcsOrdDckDetl({ id: this.$route.query.id })
+      getMcsOrdDckDetl({ id: this.$route.query.id,
+        spdId:this.$route.query.spdId,
+                    prodEntp:this.listQuery.prodEntp,
+                    isFas:this.listQuery.isFas,
+                    regcertno:this.listQuery.regcertno,  })
         .then((res) => {
           this.tableData = res.data;
           this.chuList = res.data;
@@ -1268,6 +1304,11 @@ export default {
         name: "purOrderDelivery",
         query:{spdId:this.$route.query.spdId,activeName:this.$route.query.activeName}
       });
+    },
+    // 重置
+    reset(){
+      this.$refs.listQuery.resetFields();
+      this.getData()
     }
   },
 };

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

@@ -3,8 +3,8 @@
   <div>
     <div class="common-card">
       <el-form :model="listForm" ref="planForm" :inline="true">
-        <el-form-item label="随货同行单号" prop="dyntNo">
-          <el-input v-model="listForm.dyntNo" placeholder="请输入随货同行单号"></el-input>
+        <el-form-item label="采购单号" prop="dyntNo">
+          <el-input v-model="listForm.dyntNo" placeholder="请输入采购单号"></el-input>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="getDetails('search')"
@@ -201,7 +201,23 @@
           <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="prodEntp" class="long">
+          <el-input v-model="listQuery.prodEntp" placeholder="请输入生产企业"></el-input>
+        </el-form-item>
 
+        <el-form-item size="mini" label="是否集采" prop="isFas" class="long">
+          <el-select v-model="listQuery.isFas" placeholder="请选择是否集采" clearable>
+            <el-option
+              v-for="item in isFasData"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item size="mini" label="注册证号" prop="regcertno" class="long">
+          <el-input v-model="listQuery.regcertno" placeholder="请输入注册证号"></el-input>
+        </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="getdialog('search')">查询</el-button>
             <el-button @click="reset('consumable')">重置</el-button>
@@ -300,12 +316,18 @@ export default {
         purcOrdId: "",
         current: 1,
         size: 10,
+        prodEntp:"",
+        isFas:"",
       },
       consumableData: [],
       selectData: [],
       dialogLoading: false,
       Loading: false,
       cellList: [],
+      isFasData: [
+        { value: "0", name: "是" },
+        { value: "1", name: "否" },
+      ],
     };
   },
   methods: {
@@ -473,7 +495,6 @@ export default {
               let data2 = {
                 delvOrdId: "",
                 spdId: "",
-                purcOrdId: this.$route.query.id,
                 detlList: data,
                 dyntNo: this.listForm.dyntNo,
                 purcOrdId: this.tableData[0].purcOrdId,