Ver Fonte

待确认订单加入批量确认功能

lxf há 1 ano atrás
pai
commit
32c467f9ce

+ 18 - 0
src/api/shengde/subsidiary/AddOrModifiedOrder/index.js

@@ -159,3 +159,21 @@ export function updatePartsPrice(data) {
     data: data,
   })
 }
+
+//批量提交待确认订单
+export function submissionBatch(data) {
+  return request({
+    url: '/saas-subsidiary/saas/subsidiary/contract/submissionBatch',
+    method: 'post',
+    data: data,
+  })
+}
+
+//批量提交待确认订单-历史数据
+export function contractHistoryList(data) {
+  return request({
+    url: '/saas-subsidiary/saas/subsidiary/contractHistory/list',
+    method: 'post',
+    data: data,
+  })
+}

+ 1 - 1
src/views/serviceProvider/productCenter/management/index.vue

@@ -88,7 +88,7 @@
       </div>
     </el-dialog>
     <!-- 产品字段配置对话框 -->
-    <el-dialog title="产品字段配置" :visible.sync="OpenProductField" width="80%" center top="5vh" append-to-body center :close-on-click-modal="false">
+    <el-dialog title="产品字段配置" :visible.sync="OpenProductField" width="80%" center top="5vh" append-to-body :close-on-click-modal="false">
       <el-table
         ref="multipleTable"
         :data="productFieldList"

+ 134 - 1
src/views/shengde/subsidiary/order/management/index.vue

@@ -58,7 +58,11 @@
     </el-form>
 
     <el-row :gutter="10" style="margin-bottom: 10px">
-      <el-button type="primary" size="mini" @click="handleAddOrder">新建订单</el-button>
+      <el-col :span="24">
+        <el-button type="primary" size="mini" @click="handleAddOrder">新建订单</el-button>
+        <el-button type="primary" size="mini" @click="bulkSubmission">批量提交</el-button>
+        <el-button type="primary" size="mini" @click="submissionHistory">批量提交历史</el-button>
+      </el-col>
       <!-- <el-button type="primary" size="mini" style="background-color: rgba(245, 154, 35, 1); border-color: rgba(245, 154, 35, 1)">同步订单</el-button> -->
     </el-row>
 
@@ -176,6 +180,83 @@
     <el-dialog :visible.sync="openUpload" top="50PX" width="90%" append-to-body :close-on-click-modal="false">
       <ArtworkUpload :form="rowData" @clickCancel="clickCancelUpload" ref="artworkUpload"></ArtworkUpload>
     </el-dialog>
+
+    <!-- 批量提交  -->
+    <el-dialog title="批量提交" v-if="openSubmission" :visible.sync="openSubmission" width="50%" append-to-body>
+      <div
+        v-loading="loadingSubmission"
+        element-loading-text="批量提交中,请稍后"
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.2)"
+      >
+        <div>
+          <span>当前提交: {{ submissionData.amount }}条, </span>
+          <span>提交成功: {{ submissionData.successAmount }}条, </span>
+          <span>提交失败: {{ submissionData.failAmount }}条</span>
+        </div>
+        <div style="margin-top: 20px" v-if="submissionData.detailsList && submissionData.detailsList.length > 0">
+          <el-table
+            :data="submissionData.detailsList"
+            :cell-style="{ padding: '0' }"
+            :row-style="{ height: '35px' }"
+            header-row-class-name="tableHeader"
+            border
+            height="calc(100vh - 134px - 92px)"
+          >
+            <el-table-column label="订单号" prop="contractCode" width="180" />
+            <el-table-column label="万里牛单号" prop="tradeNo" width="180" />
+            <el-table-column label="失败原因" align="center" prop="msg" min-width="180" />
+          </el-table>
+        </div>
+        <div style="width: 100%; text-align: center; padding-top: 16px">
+          <el-button type="primary" @click="openSubmission = false">确 定</el-button>
+        </div>
+      </div>
+    </el-dialog>
+
+    <!-- 批量提交历史  -->
+    <el-dialog title="批量提交历史" v-if="openHistory" :visible.sync="openHistory" width="50%" style="margin-top: 15vh" append-to-body>
+      <el-table
+        :data="contractHistory"
+        :cell-style="{ padding: '0' }"
+        :row-style="{ height: '35px' }"
+        header-row-class-name="tableHeader"
+        v-loading="loadingHistory"
+        border
+      >
+        <el-table-column label="提交时间" prop="createTime" width="160" />
+        <el-table-column label="提交数量" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.submissionQuantity">{{ Number(scope.row.submissionQuantity) }}</span>
+            <span v-else>0</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="成功数量" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.successQuantity">{{ Number(scope.row.successQuantity) }}</span>
+            <span v-else>0</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="失败数量" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.failQuantity">{{ Number(scope.row.failQuantity) }}</span>
+            <span v-else>0</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作人" align="center" prop="userName" />
+      </el-table>
+
+      <pagination
+        v-show="historyTotal > 0"
+        :total="historyTotal"
+        :page.sync="queryParamsTwo.pageNum"
+        :limit.sync="queryParamsTwo.pageSize"
+        @pagination="getHistoryList"
+      />
+      <div style="width: 100%; text-align: center; padding-top: 16px">
+        <el-button type="primary" @click="openHistory = false">确 定</el-button>
+      </div>
+    </el-dialog>
   </el-card>
 </template>
 
@@ -227,6 +308,22 @@ export default {
       dialogVisible: false,
       rowData: {},
       openUpload: false,
+      loadingSubmission: false,
+      openSubmission: false,
+      submissionData: {
+        amount: '',
+        failAmount: '',
+        successAmount: '',
+        detailsList: [],
+      },
+      contractHistory: [],
+      historyTotal: 0,
+      queryParamsTwo: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      openHistory: false,
+      loadingHistory: false,
     }
   },
   created() {},
@@ -391,6 +488,38 @@ export default {
         },
       })
     },
+    bulkSubmission() {
+      this.submissionData = {
+        amount: 1,
+        failAmount: 2,
+        successAmount: 3,
+        detailsList: [],
+      }
+      this.loadingSubmission = true
+      this.openSubmission = true
+      API.submissionBatch({}).then((res) => {
+        this.submissionData = res.data.data
+        this.loadingSubmission = false
+      })
+    },
+    submissionHistory() {
+      this.historyTotal = 0
+      this.contractHistory = []
+      this.queryParamsTwo = {
+        pageNum: 1,
+        pageSize: 10,
+      }
+      this.openHistory = true
+      this.getHistoryList()
+    },
+    getHistoryList() {
+      this.loadingHistory = true
+      API.contractHistoryList(this.queryParamsTwo).then((res) => {
+        this.contractHistory = res.data.data.records
+        this.historyTotal = res.data.data.total
+        this.loadingHistory = false
+      })
+    },
   },
 }
 </script>
@@ -412,6 +541,10 @@ export default {
     height: 35px;
     padding: 0;
   }
+  .el-dialog {
+    margin: 0 auto;
+    margin-top: 10px !important;
+  }
 }
 .searchBtn {
   background: #20b2aa;