lb

supervise-customer-ui/src/api/supervise/purchaserequisition.js

@@ -29,6 +29,7 @@ export default {
   // 通过sid查询一条记录
   fetchBySid: function(sid) {
     return request({
+      baseURL:'/api/customer',
       url: '/supervise/v1/purchaserequisition/fetchDetailsBySid/' + sid
     })
   },
@@ -63,11 +64,18 @@ export default {
       url: '/v1/purchaserequisition/checkSupplier/' + sid
     })
   },
-  // 检测供应商信息状态
+  // 请求审核状态改为通过
   updatePurchaseStateSucess: function(sid) {
     return request({
       baseURL:'/api/customer',
       url: '/v1/purchaserequisition/updatePurchaseStateSucess/' + sid
     })
+  },
+  // 上传后待提交给银行的订单列表
+  listOfCheck: function() {
+    return request({
+      baseURL:'/api/customer',
+      url: '/v1/purchaserequisition/listOfCheck'
+    })
   }
 }

supervise-customer-ui/src/views/purchaserequisition/listofcheck/PrUploadXlsx.vue

@@ -269,9 +269,9 @@
         this.totalQuantity = ''
         this.amountInTotal = ''
         this.$refs['form_obj'].resetFields()
-        this.$store.dispatch('tagsView/delView', this.$route)
+        // this.$store.dispatch('tagsView/delView', this.$route)
-        this.$router.go(-1)
+        // this.$router.go(-1)
-        // this.$emit('doback')
+        this.$emit('doback')
       },
       handleProgress(event, file, fileList) {
         // this.progressFlag = true; // 显示进度条
@@ -338,21 +338,7 @@
         req
           .fetchBySid(row.sid)
           .then(resp => {
-            if (resp.success) {
+            console.log('333', row)
-              this.formobj = resp.data
-              if (this.formobj.pros.length > 0) {
-                this.totalQuantity = this.formobj.pros.length
-                var aa = 0
-                for (var i = 0; i < this.formobj.pros.length; i++) {
-                  if (this.formobj.pros[i].totalPrice !== '') {
-                    aa = parseFloat(aa) + parseFloat(this.formobj.pros[i].totalPrice)
-                  }
-                }
-                this.amountInTotal = aa
-              }
-            } else {
-              // 根据resp.code进行异常情况处理
-            }
           })
           .catch(e => {
             this.formobj = row

supervise-customer-ui/src/views/purchaserequisition/listofcheck/index.vue

@@ -2,9 +2,32 @@
   <div class="app-container">
     <div v-show="viewState == 1">
       <button-bar ref="btnbar" view-title="采购订单列表" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <div class="main-content" style="margin-top: 10px;">
+
+        <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="handleSelectionChange">
+          <el-table-column fixed width="50" type="selection" align="center" />
+          <el-table-column fixed width="60" label="序号" type="index" align="center" />
+          <el-table-column fixed width="80" label="操作" align="center">
+            <template slot-scope="scope">
+              <el-button type="primary" size="mini" @click="showEditDrawer(scope.row)">查看</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column prop="purchaseState" label="状态" align="center" width="80">
+            <template slot-scope="scope">
+              <span>{{ scope.row.purchaseState==0?'未审核':'通过' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="code" label="订单编号" align="center" width="150" />
+          <el-table-column prop="supplierCode" label="供应商编码" align="center" width="110" />
+          <el-table-column prop="supplierOnlyCode" label="统一编码" align="center" width="100" />
+          <el-table-column prop="supplierName" label="供应商名称" header-align="center" align="left" />
+          <el-table-column prop="createTime" label="录入时间" align="center" width="160" />
+          <el-table-column prop="arrivalDate" label="到货日期" align="center" width="120" />
+        </el-table>
+      </div>
     </div>
     <el-drawer :visible.sync="drawerUploadXlsx" size="85%" :with-header="false" :before-close="drawerUploadXlsxClose">
-      <upload-xlsx />
+      <upload-xlsx ref="draweruploadxlsx" @doback="drawerUploadXlsxClose" @reloadlist="loadList" />
     </el-drawer>
   </div>
 </template>
@@ -96,8 +119,23 @@
     mounted() {
       this.$refs['btnbar'].setButtonList(this.btnList)
     },
-    created() {},
+    created() {
+      this.loadList()
+    },
     methods: {
+      loadList() {
+        req.listOfCheck().then(res => {
+          console.log('2222', res)
+          this.dataList = res.data
+        })
+      },
+      handleSelectionChange(row) {
+        console.log('zzz', row)
+      },
+      showEditDrawer(row) {
+        this.drawerUploadXlsx = true
+        this.$refs['draweruploadxlsx'].showEdit(row)
+      },
       // 搜索条件效果
       clicksearchShow() {
         this.isSearchShow = !this.isSearchShow

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionRest.java

@@ -104,4 +104,12 @@ public class PurchaseRequisitionRest implements PurchaseRequisitionFeign {
         List<PurchaseRequisition> pv = purchaseRequisitionService.listOfCheck();
         return rb.success().setData(pv);
     }
+
+    @ApiOperation("请求审核状态改为通过")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<PurchaseRequisition> fetchDetailsBySid(@PathVariable("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        PurchaseRequisition pr = purchaseRequisitionService.fetchBySid(sid);
+        return rb.success().setData(pr);
+    }
 }