Merge branch 'hhl' of SH-Arbitrate/Arbitrate-Frontend into dev

src/api/awardManagement/awardManagement.js

@@ -50,4 +50,44 @@ export function adjudicationDelivery(data) {
         method: 'post',
         data: data
     })
+}
+// 送达(不包含发送电子邮件)
+export function adjudicationService(data) {
+    return request({
+        url: '/adjudication/service',
+        method: 'post',
+        data: data
+    })
+}
+// 查询物流信息
+export function adjudicationLogistics(data) {
+    return request({
+        url: '/adjudication/logistics',
+        method: 'get',
+        params: data
+    })
+}
+// 签名(暂时只改案件状态)
+export function adjudicationSignature(data) {
+    return request({
+        url: '/adjudication/signature',
+        method: 'post',
+        data: data
+    })
+}
+// 归档(暂时只改案件状态)
+export function adjudicationCaseFile(data) {
+    return request({
+        url: '/adjudication/caseFile',
+        method: 'post',
+        data: data
+    })
+}
+// 用印(暂时只改案件状态)
+export function adjudicationStamp(data) {
+    return request({
+        url: '/adjudication/stamp',
+        method: 'post',
+        data: data
+    })
 }

src/views/awardManagement/components/MailawardDialog.vue

@@ -103,7 +103,7 @@
 </template>
 
 <script>
-import { adjudicationDelivery } from "@/api/awardManagement/awardManagement";
+import { adjudicationDelivery, adjudicationService } from "@/api/awardManagement/awardManagement";
 export default {
   props: ["openMailawardDialog", "mailawardata"],
   data() {
@@ -125,7 +125,8 @@ export default {
       // adjudicationDelivery
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          adjudicationDelivery({
+          // adjudicationDelivery({
+          adjudicationService({
             id: this.mailawardata.id,
             ...this.formData,
           })

src/views/awardManagement/components/expressDeliveryDialog.vue

@@ -7,19 +7,28 @@
       center
       :distroy-on-close="true"
     >
-      <div class="deliverName">中通快递 85644454542121</div>
-      <el-divider></el-divider>
-      <el-timeline :reverse="reverse">
-        <el-timeline-item
-          v-for="(activity, index) in activities"
-          :key="index"
-          :timestamp="activity.timestamp"
-        >
-          {{ activity.content }}
-        </el-timeline-item>
-      </el-timeline>
+      <div class="loading" v-if="flagLoading">
+        <i class="el-icon-loading"></i>
+      </div>
+      <div v-else>
+        <div class="deliverName">
+          {{ applicantdelivery.company }} {{ applicantdelivery.no }}
+        </div>
+        <el-divider></el-divider>
+        <el-timeline :reverse="reverse">
+          <el-timeline-item
+            v-for="(activity, index) in activities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            {{ activity.content }}
+          </el-timeline-item>
+        </el-timeline>
+      </div>
       <div slot="footer" class="dialog-footer">
-         <el-button @click="cancel" class="endbutton"><span>取 消</span></el-button>
+        <el-button @click="cancel" class="endbutton"
+          ><span>取 消</span></el-button
+        >
       </div>
     </el-dialog>
   </div>
@@ -27,43 +36,34 @@
 
 <script>
 export default {
-  props: ["showDelivery"],
+  props: ["showDelivery", "deliveryDataArr", "flagLoading"],
   data() {
     return {
       // key: value
       reverse: true,
-      activities: [  
-        {
-          content: "已下单 08-18 10:11",
-          timestamp: "已下单",
-        },
-        {
-          content: "已接单 08-19 10:11",
-          timestamp: "已接单",
-        },
-        {
-          content: "已发货 08-19 10:11",
-          timestamp: "已发货",
-        },
-        {
-          content: "已揽件 08-20 00:11",
-          timestamp: "已揽件",
-        },
-        {
-          content: "运输中 08-20 02:11",
-          timestamp: "运输中",
-        },
-        {
-          content: "派送中 08-22 10:11",
-          timestamp: "【西安市】快递已到达西安市临潼区",
-        },
-        {
-          content: "待取件 08-23 15:11",
-          timestamp: "【西安市】快递已到达菜鸟驿站",
-        },
-      ],
+      applicantdelivery: {}, //申请人物流信息
+      activities: [],
     };
   },
+  watch: {
+    deliveryDataArr: {
+      handler(val) {
+        if (val) {
+          val.forEach((item) => {
+            if (item.identityType == 1) {
+              let applicantdata = item.logisticsInfo;
+              this.applicantdelivery = JSON.parse(applicantdata);
+              this.activities = this.applicantdelivery.list
+              this.activities.forEach(item=>{
+                item.content = item.datetime;
+                item.timestamp = item.remark;
+              })
+            }
+          });
+        }
+      },
+    },
+  },
   methods: {
     cancel() {
       this.$emit("closeDeliveryModel");
@@ -98,4 +98,14 @@ export default {
     color: #959595;
   }
 }
+.loading {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  .el-icon-loading {
+    font-size: 50px;
+  }
+}
 </style>

src/views/awardManagement/components/paymentdetailsDialog.vue

@@ -173,6 +173,7 @@
 import {
   verificationArbitrateRecord,
   checkArbitrateRecord,
+  adjudicationSignature
 } from "@/api/awardManagement/awardManagement";
 export default {
   props: ["openDialog", "title", "flag", "detailform"],
@@ -305,6 +306,14 @@ export default {
         this.$message("成功");
       });
     },
+    // 签名
+    adjudicationSignatureFn(parms) {
+      adjudicationSignature(parms).then((res) => {
+        this.cancel();
+        this.$emit("updataList");
+        this.$message("成功");
+      })
+    },
     submitForm(parms) {
       this.$refs["form"].validate((valid) => {
         if (valid) {
@@ -325,6 +334,10 @@ export default {
               agreeOrNotCheck: 2,
               arbitrateRecord: this.arbitrateRecord,
             });
+          } else if (parms == 3) {
+            this.adjudicationSignatureFn({
+              id: this.form.id,
+            });
           }
         }
       });

src/views/awardManagement/listofAwards.vue

@@ -51,10 +51,11 @@
                         v-hasPermi="['monitor:online:forceLogout']">签名</el-button>
                     <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 14" @click="showaffixModel(scope.row, 4)"
                         v-hasPermi="['monitor:online:forceLogout']">用印申请</el-button>
-                    <el-button size="mini" type="text" icon="el-icon-truck" @click="showDeliveryModel(scope.row, 4)"
+                        <!-- v-if="scope.row.caseStatus > 15" -->
+                    <el-button size="mini" type="text" icon="el-icon-truck" v-if="scope.row.caseStatus > 15" @click="showDeliveryModel(scope.row, 4)"
                         v-hasPermi="['monitor:online:forceLogout']">快递信息</el-button>
                         <!-- v-if="scope.row.caseStatus == 15"   送达裁决书 -->
-                    <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 15"  @click="showMailaward(scope.row)"
+                    <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 15" @click="showMailaward(scope.row)"
                         v-hasPermi="['monitor:online:forceLogout']">送达裁决书</el-button>
                     <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 16" @click="showCasefilingModel(scope.row, 6)"
                         v-hasPermi="['monitor:online:forceLogout']">案件归档</el-button>
@@ -90,7 +91,9 @@
         <!-- 快递信息页面 -->
         <expressDeliveryDialog
         :showDelivery="showDelivery"
+        :deliveryDataArr="deliveryDataArr"
         @closeDeliveryModel="closeDeliveryModel"
+        :flagLoading="flagLoading"
         ></expressDeliveryDialog>
     </div>
 </template>
@@ -99,6 +102,9 @@
 import {
     caseApplicationList,
     caseApplicationDetail,
+    adjudicationLogistics,
+    adjudicationCaseFile,
+    adjudicationStamp
 } from "@/api/awardManagement/awardManagement";
 import paymentdetailsDialog from "./components/paymentdetailsDialog.vue";
 import mailawardDialog from './components/MailawardDialog.vue';
@@ -138,6 +144,8 @@ export default {
             openMailawardDialog: false,  //送达裁决书页面
             mailawardata: {},   //裁决书送达界面数据
             showDelivery: false, //快递信息弹框
+            deliveryDataArr: [],//快递信息数据
+            flagLoading: true,
         };
     },
     created() {
@@ -198,32 +206,42 @@ export default {
         showaffixModel(row) {
             this.$modal.confirm('是否进行用印申请？')
                 .then(function () {
-                //   return changeJobStatus(row.jobId, row.status);
+                  return adjudicationStamp({id:row.id});
             })
             .then(() => {
-            //   this.$modal.msgSuccess(text + "成功");
+                this.getList(this.queryParams);
+                this.$modal.msgSuccess("用印成功！");
             })
             .catch(function () {
-            //   row.status = row.status === "0" ? "1" : "0";
             });
         },
         // 快递信息弹框
         showDeliveryModel(row) {
             console.log(row,'快递');
             this.showDelivery = true
+            this.getadjudicationLogistics({id:row.id})
         },
         closeDeliveryModel() {
             this.showDelivery = false
         },
+        // 查询物流信息
+        getadjudicationLogistics(val) {
+            this.flagLoading = true;
+            adjudicationLogistics(val).then((res) => {
+                this.deliveryDataArr = res.data
+                this.flagLoading = false
+            })
+        },
         // 案件归档
-        showCasefilingModel() {
+        showCasefilingModel(row) {
             this.$modal.confirm('是否确认立即进行案件扫描？').then(
-                function () {}
+                function () {
+                    return adjudicationCaseFile({id:row.id})
+                }
             ).then(() => {
-
-            }).catch(function () {
-
-            })
+                this.getList(this.queryParams);
+                this.$modal.msgSuccess("归档成功！");
+            }).catch(function () {})
         },
         // 送达裁决书弹框
         showMailaward(row) {

src/views/caseFiling/archiveList.vue

@@ -147,7 +147,7 @@ export default {
     };
   },
   created() {
-    this.queryParams.caseStatusList = [16];
+    this.queryParams.caseStatusList = [17];
     this.getList(this.queryParams);
   },
   methods: {

src/views/caseManagement/caseList.vue

@@ -194,7 +194,7 @@
             icon="el-icon-s-check"
             @click="courtconfirmationRow(scope.row)"
             v-if="scope.row.caseStatus == 6"
-            v-hasPermi="['monitor:online:forceLogout']"
+            v-hasPermi="['caseManagement:caseList:commit']"
             >组庭确认</el-button
           >
           <el-button

src/views/paymentManagement/components/paymentdetailsDialog.vue

@@ -14,8 +14,8 @@
         <el-form-item label="案件标的：" prop="caseSubjectAmount">
           <el-input v-model="form.caseSubjectAmount" />
         </el-form-item>
-        <el-form-item label="缴费人：" prop="caseNum">
-          <el-input v-model="form.caseNum" placeholder="" />
+        <el-form-item label="缴费人：" prop="applicantName">
+          <el-input v-model="form.applicantName" placeholder="" />
         </el-form-item>
         <el-form-item label="缴费金额：" prop="feePayable">
           <el-input v-model="form.feePayable" />

vue.config.js

@@ -12,6 +12,7 @@ const name = process.env.VUE_APP_TITLE || '智慧仲裁管理系统' // 网页
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
 const API = 'http://121.40.189.20:9001'  //测试
+// const API = 'http://192.168.3.18:9001'  //B
 // const API = 'http://192.168.3.77:8080' //Q
 
 // vue.config.js 配置说明