前端gjy

src/api/V2/certificate/index.js

@@ -111,6 +111,3 @@ export const API_GET_CERTIFICATE_GETCRTLISTBYCONDITIONDATA = `${baseUrl}/certifi
 
 // 证书模块
 export const API_GET_SP_GETCRTLIST = `${baseUrl}/certificate/query/getCrtListByCondition`
-
-// 首页船舶证书统计接口
-export const API_GET_CERTIFICATEQUANTITY = `${baseUrl}/certificateHomePage/query/getCertificateQuantity`

src/api/V2/maintain/index.js

@@ -267,5 +267,3 @@ export const API_GET_STATISTICAL_MAINTAINSTATISTICS_QUERY_GETRATECOMPARISONSTATI
 
 // 维保消耗出库废弃
 export const API_POST_MAINTAIN_DISCARD = `${baseUrl}/maintainOutStoreDetail/api/discardMaintainOutStoreDetail`
-// 首页维修保养统计接口
-export const API_GET_WORKORDERQUANTITY = `${baseUrl}/maintainHomePage/query/getWorkOrderQuantity`

src/api/V2/purchase/index.js

@@ -1085,10 +1085,6 @@ export const API_POST_SPAREPARTAPPLINFO_COPYDATA = `${baseUrl}/sparepartApplInfo
 // 备件复制原有申请单查询
 export const API_POST_MATERIELAPPLINFO_COPYDATA = `${baseUrl}/materielApplInfo/query/copyData`
 
-// 首页备件与物料折线图的统计
-export const API_GET_PURCHASEQUANTITY = `${baseUrl}/purchaseHomePage/query/getPurchaseQuantity`
-// 首页备件与物料柱形图的统计
-export const API_GET_COLUMNARPURCHASEQUANTITY = `${baseUrl}/purchaseHomePage/query/getColumnarPurchaseQuantity`
 
 
 

src/model/statistical/index.js

@@ -7,25 +7,10 @@
  */
 import { errorCatcher, errorHandle, filter } from 'base-core-lib'
 import { appRx } from '../defalutConfig/indexRx'
-import { API_GET_CERTIFICATEQUANTITY } from '@/api/V2/certificate'
-import {
-  API_GET_PURCHASEQUANTITY,
-  API_GET_COLUMNARPURCHASEQUANTITY,
-} from '@/api/V2/purchase'
 import {
   API_GET_DISEMBARKSTATISTICS,
   API_GET_CREWTURNOVER_GETCREWTURNOVERDETAIL,
 } from '@/api/V2/crew'
-import { API_GET_WORKORDERQUANTITY } from '@/api/V2/maintain'
-
-// 首页维修保养统计接口
-export const getWorkOrderQuantity = appRx.get(API_GET_WORKORDERQUANTITY, errorCatcher, errorHandle, filter)
-// 首页船舶证书统计接口
-export const getCertificateQuantity = appRx.get(API_GET_CERTIFICATEQUANTITY, errorCatcher, errorHandle, filter)
-//首页备件与物料折线图的统计
-export const getPurchaseQuantity = appRx.get(API_GET_PURCHASEQUANTITY, errorCatcher, errorHandle, filter)
-//首页备件与物料柱形图的统计
-export const getColumnarPurchaseQuantity = appRx.get(API_GET_COLUMNARPURCHASEQUANTITY, errorCatcher, errorHandle, filter)
 // 船员统计 下船船员饼状图的统计
 export const downShipReason = appRx.get(API_GET_DISEMBARKSTATISTICS, errorCatcher, errorHandle, filter)
 // 船员统计 异动明细统计

src/views/contractManagement/purchaseContract.vue

@@ -83,7 +83,19 @@
       </el-table-column>
       <el-table-column prop="goodsName" label="货名" width="80">
       </el-table-column>
-      <el-table-column prop="grade" label="品级"> </el-table-column>
+      <el-table-column prop="grade" label="品级">
+        <template slot-scope="scope">
+          <span v-if="scope.row.grade == '一等品'" class="top-grade">{{
+            scope.row.grade
+          }}</span>
+          <span v-if="scope.row.grade == '二等品'" class="second-class">{{
+            scope.row.grade
+          }}</span>
+          <span v-if="scope.row.grade == '三等品'" class="third-class">{{
+            scope.row.grade
+          }}</span>
+        </template>
+      </el-table-column>
       <el-table-column prop="weight" label="重量（吨）"> </el-table-column>
       <el-table-column prop="unitContractPrice" label="合同单价（元）">
       </el-table-column>
@@ -92,7 +104,7 @@
       <el-table-column prop="seller" label="卖方"> </el-table-column>
       <el-table-column prop="imperfectGrain" label="已完成（吨）">
       </el-table-column>
-      <el-table-column prop="status" label="状态" >
+      <el-table-column prop="status" label="状态">
         <template slot-scope="scope">
           <el-popover
             placement="left"
@@ -101,8 +113,8 @@
             visible-arrow="false"
             @show="history(scope.row)"
           >
-            <template >
-              <span  slot="reference">{{ scope.row.status }}</span>
+            <template>
+              <span slot="reference">{{ scope.row.status }}</span>
             </template>
             <div>
               <p>操作历史</p>
@@ -308,13 +320,11 @@ export default {
         status = '执行中'
       } else if (row.status == '执行中') {
         status = '已完成'
-        
       }
       this.$confirm(`是否将状态改为${status}`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
-      
       })
         .then(() => {
           editstatus({ id: row.id })
@@ -359,7 +369,7 @@ export default {
       console.log(row)
       this.$router.push({
         name: 'purchaseContractExamine',
-        params: { id: row.id },
+        query: { id: row.id, status: row.status },
       })
     },
     handleAdd() {
@@ -411,23 +421,20 @@ export default {
     },
     // deletecontract(){},
     //删除
-   handleDelete(row){
-    var handleDelete = ' '//sfdkd
+    handleDelete(row) {
+      var handleDelete = ' ' //sfdkd
       if (row.handleDelete == '待执行' || row.handleDelete == '已完成') {
-       handleDelete = '执行中'
+        handleDelete = '执行中'
       } else if (row.handleDelete == '执行中') {
         handleDelete = '已完成'
-        
       }
       this.$confirm(`合同删除后不可恢复，是否继续删除？`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
-      
       })
         .then(() => {
-          
-          deletecontract({id: row.id })
+          deletecontract({ id: row.id })
             .toPromise()
             .then((response) => {
               this.$notify.success({
@@ -443,13 +450,29 @@ export default {
         .catch(() => {
           return false
         })
-    }
-
-    
+    },
   },
 }
 </script>
 <style lang="scss" scoped>
+.top-grade {
+  background: linear-gradient(90deg, #5678e9, #7993f6);
+  color: #fff;
+  padding: 3px;
+  border-radius: 2px;
+}
+.second-class {
+  background: linear-gradient(90deg, #50cdd9, #82e2ea);
+  color: #fff;
+  padding: 3px;
+  border-radius: 2px;
+}
+.third-class {
+  background: linear-gradient(90deg, #ffa735, #ffbf70);
+  color: #fff;
+  padding: 3px;
+  border-radius: 2px;
+}
 .wrap {
   width: 400px;
   position: absolute;

src/views/contractManagement/purchaseContractExamine.vue

@@ -1,10 +1,12 @@
 <!--销售合同-->
 <!--2019年5月30日 20:25:16 by jlx-->
 <template>
-  <div class='container'>
+  <div class="container">
     <el-row>
       <el-col :span="12">
-        <h2 class="bg-left">查看合同详情</h2>
+        <h2 class="bg-left">
+          查看合同详情<span>状态：{{ status }}</span>
+        </h2>
       </el-col>
       <el-col :span="12" class="bg-right">
         <el-button
@@ -16,169 +18,95 @@
         >
       </el-col>
     </el-row>
-   
+
     <ws-form
       ref="deptBudgetList"
       :rules="mainReportAdd"
       :model="deptBudgetList"
     >
       <div class="remark">
-      <h3>基本信息</h3>
+        <h3>基本信息</h3>
       </div>
-        <ws-info-table>
-          <ws-form-item
-            label="合同编号"
-            span="1"
-            prop="contractNo"
-          >
-          {{deptBudgetList.contractNo}}
-          </ws-form-item>
-          <ws-form-item
-            label="运输方式"
-            span="1"
-            prop="shippingType"
-          >
-          {{deptBudgetList.shippingType}}
-          </ws-form-item>
-          <ws-form-item
-            label="买方"
-            span="1"
-            prop="buyer"
-          >
-          {{deptBudgetList.buyer}}
-          </ws-form-item>
-          <ws-form-item
-            label="结算方式"
-            span="1"
-            prop="settlementMethod"
-          >{{deptBudgetList.settlementMethod}}
-          </ws-form-item>
-          <ws-form-item
-            label="卖方"
-            span="1"
-            prop="seller"
-          >{{deptBudgetList.seller}}
-          </ws-form-item>
-          <ws-form-item
-            label="货源地"
-            span="1"
-            prop="sourceGoods"
-          >{{deptBudgetList.sourceGoods}}
-          </ws-form-item>
-          <ws-form-item
-            label="买方电话"
-            span="1"
-            prop="buyerPhone"
-          >{{deptBudgetList.buyerPhone}}
-          </ws-form-item>
-          <ws-form-item
-            label="交货地"
-            span="1"
-            prop="placeDelivery">
-            {{deptBudgetList.placeDelivery}}
-          </ws-form-item>
-           <ws-form-item
-            label="卖方电话"
-            span="1"
-            prop="sellerPhone">
-            {{deptBudgetList.sellerPhone}}
-          </ws-form-item>
-          <ws-form-item
-            label="包装方式"
-            span="1"
-            prop="packingMethod">
-            {{deptBudgetList.packingMethod}}
-          </ws-form-item>
-          <ws-form-item
-            label="重量（吨）"
-            span="1"
-            prop="weight">
-            {{deptBudgetList.weight}}
-          </ws-form-item>
-          <ws-form-item
-            label="验收方式"
-            span="1"
-            prop="acceptanceMethod">
-            {{deptBudgetList.acceptanceMethod}}
-          </ws-form-item>
-          <ws-form-item
-            label="溢短装（%）"
-            span="1"
-            prop="overShort">
-            {{deptBudgetList.overShort}}
-          </ws-form-item>
-          <ws-form-item
-            label="交货日期（起）"
-            span="1"
-            prop="deliveryDateStart">
-            {{deptBudgetList.deliveryDateStart}}
-          </ws-form-item>
-          <ws-form-item
-            label="合同单价（元/吨）"
-            span="1"
-            prop="unitContractPrice">
-            {{deptBudgetList.unitContractPrice}}
-          </ws-form-item>
-          <ws-form-item
-            label="交货日期（止）"
-            span="1"
-            prop="deliveryDateEnd">
-            {{deptBudgetList.deliveryDateEnd}}
-          </ws-form-item>
-          <ws-form-item
-            label="合同总价（元）"
-            span="1"
-            prop="totalContractPrice">
-            {{deptBudgetList.totalContractPrice}}
-          </ws-form-item>
-          <ws-form-item
-            label="签订日期"
-            span="1"
-            prop="signingDate">
-            {{deptBudgetList.signingDate}}
-          </ws-form-item>
-        </ws-info-table>
+      <ws-info-table>
+        <ws-form-item label="合同编号" span="1" prop="contractNo">
+          {{ deptBudgetList.contractNo }}
+        </ws-form-item>
+        <ws-form-item label="运输方式" span="1" prop="shippingType">
+          {{ deptBudgetList.shippingType }}
+        </ws-form-item>
+        <ws-form-item label="买方" span="1" prop="buyer">
+          {{ deptBudgetList.buyer }}
+        </ws-form-item>
+        <ws-form-item label="结算方式" span="1" prop="settlementMethod"
+          >{{ deptBudgetList.settlementMethod }}
+        </ws-form-item>
+        <ws-form-item label="卖方" span="1" prop="seller"
+          >{{ deptBudgetList.seller }}
+        </ws-form-item>
+        <ws-form-item label="货源地" span="1" prop="sourceGoods"
+          >{{ deptBudgetList.sourceGoods }}
+        </ws-form-item>
+        <ws-form-item label="买方电话" span="1" prop="buyerPhone"
+          >{{ deptBudgetList.buyerPhone }}
+        </ws-form-item>
+        <ws-form-item label="交货地" span="1" prop="placeDelivery">
+          {{ deptBudgetList.placeDelivery }}
+        </ws-form-item>
+        <ws-form-item label="卖方电话" span="1" prop="sellerPhone">
+          {{ deptBudgetList.sellerPhone }}
+        </ws-form-item>
+        <ws-form-item label="包装方式" span="1" prop="packingMethod">
+          {{ deptBudgetList.packingMethod }}
+        </ws-form-item>
+        <ws-form-item label="重量（吨）" span="1" prop="weight">
+          {{ deptBudgetList.weight }}
+        </ws-form-item>
+        <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
+          {{ deptBudgetList.acceptanceMethod }}
+        </ws-form-item>
+        <ws-form-item label="溢短装（%）" span="1" prop="overShort">
+          {{ deptBudgetList.overShort }}
+        </ws-form-item>
+        <ws-form-item label="交货日期（起）" span="1" prop="deliveryDateStart">
+          {{ deptBudgetList.deliveryDateStart }}
+        </ws-form-item>
+        <ws-form-item
+          label="合同单价（元/吨）"
+          span="1"
+          prop="unitContractPrice"
+        >
+          {{ deptBudgetList.unitContractPrice }}
+        </ws-form-item>
+        <ws-form-item label="交货日期（止）" span="1" prop="deliveryDateEnd">
+          {{ deptBudgetList.deliveryDateEnd }}
+        </ws-form-item>
+        <ws-form-item label="合同总价（元）" span="1" prop="totalContractPrice">
+          {{ deptBudgetList.totalContractPrice }}
+        </ws-form-item>
+        <ws-form-item label="签订日期" span="1" prop="signingDate">
+          {{ deptBudgetList.signingDate }}
+        </ws-form-item>
+      </ws-info-table>
       <base-card>
-      
-      <!--面试信息-->
-      <div class="remark">
-      <h3>货物信息</h3>
-    </div>
+        <!--面试信息-->
+        <div class="remark">
+          <h3>货物信息</h3>
+        </div>
         <ws-info-table>
-          <ws-form-item
-            label="货名"
-            span="1"
-            prop="waterContent"
-          >
-          {{deptBudgetList.contractGoodsInfo.goodsName}}
+          <ws-form-item label="货名" span="1" prop="waterContent">
+            {{ deptBudgetList.contractGoodsInfo.goodsName }}
           </ws-form-item>
-          <ws-form-item
-            label="水分（%）<="
-            span="1"
-            prop="intendedShipId"
-          >
-          {{deptBudgetList.contractGoodsInfo.waterContent}}
+          <ws-form-item label="水分（%）<=" span="1" prop="intendedShipId">
+            {{ deptBudgetList.contractGoodsInfo.waterContent }}
           </ws-form-item>
-          <ws-form-item
-            label="品级"
-            span="1"
-            prop="grade"
-          >
-           {{deptBudgetList.contractGoodsInfo.grade}}
+          <ws-form-item label="品级" span="1" prop="grade">
+            {{ deptBudgetList.contractGoodsInfo.grade }}
           </ws-form-item>
-          <ws-form-item
-            label="杂质（%）<="
-            span="1"
-            prop="impurity"
-          >
-          {{deptBudgetList.contractGoodsInfo.impurity}}
+          <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
+            {{ deptBudgetList.contractGoodsInfo.impurity }}
           </ws-form-item>
-          <ws-form-item
-            label="容重（克/升）<="
-            span="1"
-            prop="bulkDensity"
-          >
-          {{deptBudgetList.contractGoodsInfo.bulkDensity}}
+          <ws-form-item label="容重（克/升）<=" span="1" prop="bulkDensity">
+            {{ deptBudgetList.contractGoodsInfo.bulkDensity }}
           </ws-form-item>
           <ws-form-item
             label="霉变粒（%）<="
@@ -186,14 +114,10 @@
             prop="mildewGrain"
             class="result"
           >
-            {{deptBudgetList.contractGoodsInfo.mildewGrain}}
+            {{ deptBudgetList.contractGoodsInfo.mildewGrain }}
           </ws-form-item>
-           <ws-form-item
-            label="热损伤（%）<="
-            span="1"
-            prop="jiaorenli"
-          >
-            {{deptBudgetList.contractGoodsInfo.jiaorenli}}
+          <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
+            {{ deptBudgetList.contractGoodsInfo.jiaorenli }}
           </ws-form-item>
           <ws-form-item
             label="不完善粒（%）<="
@@ -201,74 +125,54 @@
             prop="imperfectGrain"
             class="result"
           >
-            {{deptBudgetList.contractGoodsInfo.imperfectGrain}}
+            {{ deptBudgetList.contractGoodsInfo.imperfectGrain }}
           </ws-form-item>
         </ws-info-table>
         <div class="remark">
           <h3>流程信息</h3>
         </div>
         <ws-info-table>
-          <ws-form-item
-            label="合同收入（元）"
-            span="1"
-            prop="goodsNameKey"
-          >
-          {{deptBudgetList.contractProcessInfo.goodsNameKey}}
+          <ws-form-item label="合同收入（元）" span="1" prop="goodsNameKey">
+            {{ deptBudgetList.contractProcessInfo.goodsNameKey }}
           </ws-form-item>
-          <ws-form-item
-            label="已开发票（元）"
-            span="1"
-            prop="goodsName"
-          >
-          {{deptBudgetList.contractProcessInfo.goodsName}}
+          <ws-form-item label="已开发票（元）" span="1" prop="goodsName">
+            {{ deptBudgetList.contractProcessInfo.goodsName }}
           </ws-form-item>
-          <ws-form-item
-            label="费用支出（元）"
-            span="1"
-            prop="waterContent"
-          >{{deptBudgetList.contractProcessInfo.waterContent}}
+          <ws-form-item label="费用支出（元）" span="1" prop="waterContent"
+            >{{ deptBudgetList.contractProcessInfo.waterContent }}
           </ws-form-item>
-          <ws-form-item
-            label="未开发票（元）"
-            span="1"
-            prop="impurity"
-          >{{deptBudgetList.contractProcessInfo.impurity}}
+          <ws-form-item label="未开发票（元）" span="1" prop="impurity"
+            >{{ deptBudgetList.contractProcessInfo.impurity }}
           </ws-form-item>
-          <ws-form-item
-            label="未回款（元）"
-            span="1"
-            prop="mildewGrain"
-          >{{deptBudgetList.contractProcessInfo.mildewGrain}}
+          <ws-form-item label="未回款（元）" span="1" prop="mildewGrain"
+            >{{ deptBudgetList.contractProcessInfo.mildewGrain }}
           </ws-form-item>
           <ws-form-item
             label="已完成发运量（吨）"
             span="1"
             prop="imperfectGrain"
             class="result"
-          >{{deptBudgetList.contractProcessInfo.imperfectGrain}}
+            >{{ deptBudgetList.contractProcessInfo.imperfectGrain }}
           </ws-form-item>
-           <ws-form-item
-            label="双章原件回收情况"
-            span="1"
-            prop="grade"
-          >{{deptBudgetList.contractProcessInfo.grade}}
+          <ws-form-item label="双章原件回收情况" span="1" prop="grade"
+            >{{ deptBudgetList.contractProcessInfo.grade }}
           </ws-form-item>
         </ws-info-table>
         <div class="remark">
           <h3>备注信息</h3>
         </div>
-        {{deptBudgetList.remarks}}
-        <img :src="deptBudgetList.addressUrl" alt="">
+        {{ deptBudgetList.remarks }}
+        <img :src="deptBudgetList.addressUrl" alt="" />
       </base-card>
     </ws-form>
-    <div style='text-align:right;padding:10px;'>
+    <div style="text-align: right; padding: 10px">
       <el-button
-          class="bg-bottom"
-          type="primary"
-          size="small"
-          @click="returnsales()"
-          >关闭</el-button
-        >
+        class="bg-bottom"
+        type="primary"
+        size="small"
+        @click="returnsales()"
+        >关闭</el-button
+      >
     </div>
   </div>
 </template>
@@ -306,6 +210,7 @@ export default {
       showType: true,
       // 年
       year: '',
+      status: '',
       // 提交类型
       submitType: true,
       tableData: [{ date: 1111, name: 'qqqq', address: 'errrtt' }],
@@ -320,13 +225,14 @@ export default {
   },
 
   activated() {
+    this.status = this.$route.query.status
     this.loaddata()
     this.showType = this.isShow
   },
   methods: {
     loaddata() {
       // 数据
-      examineList({ id: this.$route.params.id })
+      examineList({ id: this.$route.query.id })
         .toPromise()
         .then((response) => {
           this.deptBudgetList = response

src/views/contractManagement/salesContract.vue

@@ -242,10 +242,16 @@ export default {
       contractForm: {},
       categoryIndex: 0,
       rulesVendor: {},
-
+      deptBudgetTotal: 0,
+      size: 10,
+      compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
       accessoryTFs: false,
-      // pickerBeginDateBefore: {},
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          return time.getTime() > Date.now()
+        },
+      },
       tableData: [],
       taskTypeList: [
         { value: '未完成', type: 1 },
@@ -254,7 +260,6 @@ export default {
         { value: '全部合同', type: '' },
       ],
       deptBudgetList: {
-        compId: sessionStorage.getItem('ws-pf_compId'),
         seafarerName: '',
         crtDutyId: '',
         crtDutyName: '',
@@ -280,7 +285,6 @@ export default {
     this.deletecontract()
     this.getList()
     this.showType = this.isShow
-    console.log(11111)
   },
   methods: {
     handleClose() {
@@ -294,6 +298,14 @@ export default {
           this.historyList = response
         })
     },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
     uploadSuccess(data, files, url) {
       console.log(data, files, url)
 
@@ -405,7 +417,7 @@ export default {
       console.log(row)
       this.$router.push({
         name: 'salesContractExamine',
-        params: { id: row.id },
+        query: { id: row.id, status: row.status },
       })
     },
     handleAdd() {
@@ -421,8 +433,7 @@ export default {
     handleEdit(row) {
       this.$router.push({
         name: 'salesContractEdit',
-
-        params: { id: row.id },
+        query: { id: row.id },
       })
     },
 
@@ -431,12 +442,6 @@ export default {
     total() {},
     clearfiltQuery() {},
     selectCrtDuty() {},
-    pickerBeginDateBefore: {
-      disabledDate: (time) => {
-        return time.getTime() > Date.now()
-      },
-    },
-
     handleDelete(row) {
       var handleDelete = ''
       if (row.handleDelete == '待执行' || row.handleDelete == '已完成') {

src/views/contractManagement/salesContractExamine.vue

@@ -6,7 +6,9 @@
   <div class="container">
     <el-row>
       <el-col :span="12">
-        <h2 class="bg-left">查看合同详情</h2>
+        <h2 class="bg-left">
+          查看合同详情<span>状态：{{ status }}</span>
+        </h2>
       </el-col>
       <el-col :span="12" class="bg-right">
         <el-button
@@ -18,7 +20,7 @@
         >
       </el-col>
     </el-row>
-   
+
     <ws-form
       ref="deptBudgetList"
       :rules="mainReportAdd"
@@ -92,123 +94,79 @@
 
       <!--面试信息-->
       <div class="remark">
-      <h3>货物信息</h3>
-    </div>
-        <ws-info-table>
-          <ws-form-item
-            label="货名"
-            span="1"
-            prop="waterContent"
-          >
-          {{deptBudgetList.contractGoodsInfo.goodsName}}
-          </ws-form-item>
-          <ws-form-item
-            label="水分（%）<="
-            span="1"
-            prop="intendedShipId"
-          >
-          {{deptBudgetList.contractGoodsInfo.waterContent}}
-          </ws-form-item>
-          <ws-form-item
-            label="品级"
-            span="1"
-            prop="grade"
-          >
-           {{deptBudgetList.contractGoodsInfo.grade}}
-          </ws-form-item>
-          <ws-form-item
-            label="杂质（%）<="
-            span="1"
-            prop="impurity"
-          >
-          {{deptBudgetList.contractGoodsInfo.impurity}}
-          </ws-form-item>
-          <ws-form-item
-            label="容重（克/升）<="
-            span="1"
-            prop="bulkDensity"
-          >
-          {{deptBudgetList.contractGoodsInfo.bulkDensity}}
-          </ws-form-item>
-          <ws-form-item
-            label="霉变粒（%）<="
-            span="1"
-            prop="mildewGrain"
-            class="result"
-          >
-            {{deptBudgetList.contractGoodsInfo.mildewGrain}}
-          </ws-form-item>
-           <ws-form-item
-            label="热损伤（%）<="
-            span="1"
-            prop="jiaorenli"
-          >
-            {{deptBudgetList.contractGoodsInfo.jiaorenli}}
-          </ws-form-item>
-          <ws-form-item
-            label="不完善粒（%）<="
-            span="1"
-            prop="imperfectGrain"
-            class="result"
-          >
-            {{deptBudgetList.contractGoodsInfo.imperfectGrain}}
-          </ws-form-item>
-        </ws-info-table>
-        <div class="remark">
-          <h3>流程信息</h3>
-        </div>
-        <ws-info-table>
-          <ws-form-item
-            label="合同收入（元）"
-            span="1"
-            prop="goodsNameKey"
-          >
-          {{deptBudgetList.contractProcessInfo.goodsNameKey}}
-          </ws-form-item>
-          <ws-form-item
-            label="已开发票（元）"
-            span="1"
-            prop="goodsName"
-          >
-          {{deptBudgetList.contractProcessInfo.goodsName}}
-          </ws-form-item>
-          <ws-form-item
-            label="费用支出（元）"
-            span="1"
-            prop="waterContent"
-          >{{deptBudgetList.contractProcessInfo.waterContent}}
-          </ws-form-item>
-          <ws-form-item
-            label="未开发票（元）"
-            span="1"
-            prop="impurity"
-          >{{deptBudgetList.contractProcessInfo.impurity}}
-          </ws-form-item>
-          <ws-form-item
-            label="未回款（元）"
-            span="1"
-            prop="mildewGrain"
-          >{{deptBudgetList.contractProcessInfo.mildewGrain}}
-          </ws-form-item>
-          <ws-form-item
-            label="已完成发运量（吨）"
-            span="1"
-            prop="imperfectGrain"
-            class="result"
-          >{{deptBudgetList.contractProcessInfo.imperfectGrain}}
-          </ws-form-item>
-           <ws-form-item
-            label="双章原件回收情况"
-            span="1"
-            prop="grade"
-          >{{deptBudgetList.contractProcessInfo.grade}}
-          </ws-form-item>
-        </ws-info-table>
-        <div class="remark">
-          <h3>备注信息</h3>
-        </div>
-        {{deptBudgetList.remarks}}
-        <img :src="deptBudgetList.addressUrl" alt="">
+        <h3>货物信息</h3>
+      </div>
+      <ws-info-table>
+        <ws-form-item label="货名" span="1" prop="waterContent">
+          {{ deptBudgetList.contractGoodsInfo.goodsName }}
+        </ws-form-item>
+        <ws-form-item label="水分（%）<=" span="1" prop="intendedShipId">
+          {{ deptBudgetList.contractGoodsInfo.waterContent }}
+        </ws-form-item>
+        <ws-form-item label="品级" span="1" prop="grade">
+          {{ deptBudgetList.contractGoodsInfo.grade }}
+        </ws-form-item>
+        <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
+          {{ deptBudgetList.contractGoodsInfo.impurity }}
+        </ws-form-item>
+        <ws-form-item label="容重（克/升）<=" span="1" prop="bulkDensity">
+          {{ deptBudgetList.contractGoodsInfo.bulkDensity }}
+        </ws-form-item>
+        <ws-form-item
+          label="霉变粒（%）<="
+          span="1"
+          prop="mildewGrain"
+          class="result"
+        >
+          {{ deptBudgetList.contractGoodsInfo.mildewGrain }}
+        </ws-form-item>
+        <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
+          {{ deptBudgetList.contractGoodsInfo.jiaorenli }}
+        </ws-form-item>
+        <ws-form-item
+          label="不完善粒（%）<="
+          span="1"
+          prop="imperfectGrain"
+          class="result"
+        >
+          {{ deptBudgetList.contractGoodsInfo.imperfectGrain }}
+        </ws-form-item>
+      </ws-info-table>
+      <div class="remark">
+        <h3>流程信息</h3>
+      </div>
+      <ws-info-table>
+        <ws-form-item label="合同收入（元）" span="1" prop="goodsNameKey">
+          {{ deptBudgetList.contractProcessInfo.goodsNameKey }}
+        </ws-form-item>
+        <ws-form-item label="已开发票（元）" span="1" prop="goodsName">
+          {{ deptBudgetList.contractProcessInfo.goodsName }}
+        </ws-form-item>
+        <ws-form-item label="费用支出（元）" span="1" prop="waterContent"
+          >{{ deptBudgetList.contractProcessInfo.waterContent }}
+        </ws-form-item>
+        <ws-form-item label="未开发票（元）" span="1" prop="impurity"
+          >{{ deptBudgetList.contractProcessInfo.impurity }}
+        </ws-form-item>
+        <ws-form-item label="未回款（元）" span="1" prop="mildewGrain"
+          >{{ deptBudgetList.contractProcessInfo.mildewGrain }}
+        </ws-form-item>
+        <ws-form-item
+          label="已完成发运量（吨）"
+          span="1"
+          prop="imperfectGrain"
+          class="result"
+          >{{ deptBudgetList.contractProcessInfo.imperfectGrain }}
+        </ws-form-item>
+        <ws-form-item label="双章原件回收情况" span="1" prop="grade"
+          >{{ deptBudgetList.contractProcessInfo.grade }}
+        </ws-form-item>
+      </ws-info-table>
+      <div class="remark">
+        <h3>备注信息</h3>
+      </div>
+      {{ deptBudgetList.remarks }}
+      <img :src="deptBudgetList.addressUrl" alt="" />
 
       <!-- </base-card> -->
     </ws-form>
@@ -226,7 +184,6 @@
 
 <script>
 import {
-  
   getList,
   packList,
   addList,
@@ -274,16 +231,16 @@ export default {
   },
 
   created() {
+    this.status = this.$route.query.status
     this.loaddata()
     this.showType = this.isShow
     this.getList()
     this.examineList()
   },
   methods: {
-    
     loaddata() {
       // 数据
-      examineList({ id: this.$route.params.id })
+      examineList({ id: this.$route.query.id })
         .toPromise()
         .then((response) => {
           this.deptBudgetList = response

src/views/home/components/shipCertificate.vue

@@ -7,61 +7,70 @@
     </div>
     <div class="shipCertificate">
       <div class="shipCertificate-Progress">
-        <p class="shipCertificate-Progress_title">{{$t('home.testCase')}}</p>
-        <div style="width:100%;border-right:2px solid #EDEDED;position: relative;">
+        <p class="shipCertificate-Progress_title">{{ $t('home.testCase') }}</p>
+        <div
+          style="
+            width: 100%;
+            border-right: 2px solid #ededed;
+            position: relative;
+          "
+        >
           <div class="shipCertificate-Progress_internalTitle">
-            <p>{{$t('home.toBeChecked')}}</p>
-            <p>{{certifiTitle}}{{$t('common.pieces')}}</p>
+            <p>{{ $t('home.toBeChecked') }}</p>
+            <p>{{ certifiTitle }}{{ $t('common.pieces') }}</p>
           </div>
-          <el-progress type="circle"
-                       :stroke-width="10"
-                       color="#3280FF"
-                       :width="100"
-                       :show-text="false"
-                       style="border:2px solid #3280FF;border-radius: 50%;"
-                       :percentage="percentage">
+          <el-progress
+            type="circle"
+            :stroke-width="10"
+            color="#3280FF"
+            :width="100"
+            :show-text="false"
+            style="border: 2px solid #3280ff; border-radius: 50%"
+            :percentage="percentage"
+          >
           </el-progress>
         </div>
         <div class="shipCertificate-Progress_footer">
-          <p>{{$t('home.certificateInspected')}}</p>
-          <p style="padding-left:10px">{{certifiList}}</p>
+          <p>{{ $t('home.certificateInspected') }}</p>
+          <p style="padding-left: 10px">{{ certifiList }}</p>
         </div>
       </div>
       <div class="shipCertificate-Progress">
-        <p class="shipCertificate-Progress_title">{{$t('home.theRenewal')}}</p>
-        <div style="width:100%;position: relative;">
+        <p class="shipCertificate-Progress_title">
+          {{ $t('home.theRenewal') }}
+        </p>
+        <div style="width: 100%; position: relative">
           <div class="shipCertificate-Progress_internalTitleOther">
-            <p>{{$t('zs.common.change')}}</p>
-            <p>{{shipCertifiTitle}}{{$t('common.pieces')}}</p>
+            <p>{{ $t('zs.common.change') }}</p>
+            <p>{{ shipCertifiTitle }}{{ $t('common.pieces') }}</p>
           </div>
-          <el-progress type="circle"
-                       :stroke-width="10"
-                       :width="101"
-                       :show-text="false"
-                       color="#FF8F00"
-                       style="border:2px solid #FF8F00;border-radius: 50%;"
-                       :percentage="percentageOther">
+          <el-progress
+            type="circle"
+            :stroke-width="10"
+            :width="101"
+            :show-text="false"
+            color="#FF8F00"
+            style="border: 2px solid #ff8f00; border-radius: 50%"
+            :percentage="percentageOther"
+          >
           </el-progress>
         </div>
         <div class="shipCertificate-Progress_footer">
-          <p>{{$t('home.certificateRenewal')}}</p>
-          <p style="padding-left:10px">{{shipCertifiList}}</p>
+          <p>{{ $t('home.certificateRenewal') }}</p>
+          <p style="padding-left: 10px">{{ shipCertifiList }}</p>
         </div>
       </div>
     </div>
   </div>
 </template>
 <script>
-import {
-  getCertificateQuantity // 船舶证书的统计
-} from '@/model/statistical/index'
 import WsShipDropdown from '@/components/ShipDown/index'
 export default {
   name: 'shipCertificate',
   components: {
-    WsShipDropdown
+    WsShipDropdown,
   },
-  data () {
+  data() {
     return {
       certifiTitle: '',
       shipCertifiTitle: '',
@@ -70,31 +79,17 @@ export default {
       shipCertifiList: '', //换证情况
       certifiList: '', //检验情况
       page: {
-        vesselId: ''
-      }
+        vesselId: '',
+      },
     }
   },
-  mounted () {
-    this.getCertificateList()
-  },
+  mounted() {},
   methods: {
-    // 首页船舶证书的统计
-    getCertificateList () {
-      getCertificateQuantity(this.page).toPromise().then(res => {
-        const { toBeTestedTotal, toBeReplacedTotal, certificateTotal } = res
-        this.certifiTitle = toBeTestedTotal
-        this.shipCertifiTitle = toBeReplacedTotal
-        this.certifiList = (certificateTotal ? certificateTotal : '0') + '/' + (toBeTestedTotal ? toBeTestedTotal : '0')
-        this.shipCertifiList = (certificateTotal ? certificateTotal : '0') + '/' + (toBeReplacedTotal ? toBeReplacedTotal : '0')
-        this.percentage = (toBeTestedTotal / certificateTotal) * 100
-        this.percentageOther = (toBeReplacedTotal / certificateTotal) * 100
-      })
-    },
-    shipCertificate (command) {
+    shipCertificate(command) {
       this.page.vesselId = command
       this.getCertificateList()
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>

vue.config.js

@@ -142,9 +142,9 @@ module.exports = {
 
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
-        // target: 'http://localhost:8090/',
+        target: 'http://localhost:8090/',
         // target: 'http://192.168.1.124:8090/',
-        target: 'http://192.168.1.110:8090/',
+        // target: 'http://192.168.1.110:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',
         // target: 'http://192.168.24.5:8098',//目标地址