需求114 后台-集运-包裹列表-操作-特需

src/api/ecw/consSpecialNeed.js

@@ -42,6 +42,14 @@ export function getSpecialListByConsId(id) {
   })
 }
 
+// 根据包裹id特需列表
+export function selectAllSpecialListByConsId(id) {
+  return request({
+    url: '/ecw/cons-special-need/selectAllSpecialListByConsId?consId=' + id,
+    method: 'get'
+  })
+}
+
 // 获得包裹特需分页
 export function getConsSpecialNeedPage(query) {
   return request({

src/utils/dict.js

@@ -286,6 +286,7 @@ export const DICT_TYPE = {
   ECW_LANGUAGE_CODE: "ecw_language_code",//语言编码
   CONS_STATUS: "cons_status", //包裹状态
   CONS_INSPECT_STATUS: "cons_inspect_status", //验货状态
+  CONS_SPECIAL_NEEDS_STATUS: "cons_special_needs_status",//特需状态
 };
 
 /**

src/views/ecw/cons/components/SpecialNeedsConsLook.vue

+<template>
+  <div>
+    <el-dialog center width="80%" :before-close="()=>{$emit('update:showSpecialNeedsConsLook',false)}"
+               :visible.sync="showSpecialNeedsConsLook">
+      <div class="content">
+        <h1>{{ consNum }} 特需-查看</h1>
+        <el-row v-for="item in echoList">
+          <el-col :span="24">
+            {{ $t("特需") }}:
+            <dict-tag :type="DICT_TYPE.ORDER_SPECIAL_NEEDS" :value="item.advanceType" />-
+            <span v-if="item.deleted">已删除</span>
+            <dict-tag v-else :type="DICT_TYPE.CONS_SPECIAL_NEEDS_STATUS" :value="item.needStatus" />
+          </el-col>
+          <el-col :span="24">
+            {{ $t("备注") }}:{{ item.remarks }}
+          </el-col>
+          <el-col :span="24">
+            {{ $t("金额") }}:{{ item.expectedFee }}{{ item.expectedFeeCurrencyName }}-
+            <dict-tag :type="DICT_TYPE.PAYMENT_TYPE" :value="item.payType" />
+          </el-col>
+          <el-col :span="6">
+            {{ $t("创建人") }}:{{ item.creatorName }}
+          </el-col>
+          <el-col :span="6">
+            {{ $t("创建时间") }}:{{ parseTime(item.createTime) }}
+          </el-col>
+          <el-col :span="6">
+            {{ $t("处理人") }}:{{ item.auditorName }}
+          </el-col>
+          <el-col :span="6">
+            {{ $t("处理时间") }}:{{ parseTime(item.auditorTime) }}
+          </el-col>
+        </el-row>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="$emit('update:showSpecialNeedsConsLook',false)">{{ $t("取消") }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { DICT_TYPE } from "@/utils/dict"
+import { selectAllSpecialListByConsId } from "@/api/ecw/consSpecialNeed"
+import { getCurrencyList } from "@/api/ecw/currency"
+
+export default {
+  name: "specialNeedsCons",
+  props: {
+    consId: {
+      type: [String, Number]
+    },
+    consNum: [String, Number],
+    showSpecialNeedsConsLook: Boolean
+  },
+  data() {
+    return {
+      DICT_TYPE,
+      remarks: "",
+      echoList: [],
+      currencyList: []
+    }
+  },
+  methods: {},
+  watch: {
+    showSpecialNeedsConsLook(val) {
+      getCurrencyList().then((res) => (this.currencyList = res.data))
+      if (val) {
+        const that = this
+        //特需回显
+        selectAllSpecialListByConsId(this.consId).then(r => {
+          r.data.forEach(row => {
+            row.expectedFeeCurrencyName = that.currencyList.filter(item => item.id == row.expectedFeeCurrency)[0]["titleEn"]
+          })
+          console.log(r.data)
+          that.echoList = r.data
+        })
+      } else {
+        this.echoList = []
+      }
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.el-row {
+  margin-bottom: 20px;
+
+  &:last-child {
+    margin-bottom: 0;
+  }
+}
+
+.el-col {
+  margin-bottom: 10px;
+}
+</style>

src/views/ecw/cons/index.vue

@@ -169,6 +169,7 @@
                      v-hasPermi="['ecw:cons:delete']">删除</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="transmutation(scope.row)">{{$t('转异')}}</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="specialNeedsCons(scope.row)">{{$t('特需')}}</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="specialNeedsConsLook(scope.row)">{{$t('特需查看')}}</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -251,6 +252,8 @@
     </el-dialog>
     <Transmutation :showException.sync="showException" :id="id" @determine="getList"></Transmutation>
     <SpecialNeedsCons :showSpecialNeedsCons.sync="showSpecialNeedsCons" :currency="JSON.stringify(currencyList)" :consId="id" :consNum="consNum" @determine="getList"></SpecialNeedsCons>
+    <SpecialNeedsConsLook :showSpecialNeedsConsLook.sync="showSpecialNeedsConsLook" :consNum="consNum" :consId="id"></SpecialNeedsConsLook>
+
   </div>
 </template>
 
@@ -263,6 +266,8 @@ import { getWarehouseList } from "@/api/ecw/warehouse";
 import {getTradeCountryList} from "@/api/ecw/region";
 import {getRegionList} from "@/api/ecw/order";
 import SpecialNeedsCons from "@/views/ecw/cons/components/SpecialNeedsCons.vue"
+import SpecialNeedsConsLook from "@/views/ecw/cons/components/SpecialNeedsConsLook.vue"
+
 import { getCurrencyList } from "@/api/ecw/currency"
 
 export default {
@@ -271,6 +276,7 @@ export default {
     UserSelector,
     Transmutation,
     Template,
+    SpecialNeedsConsLook,
     SpecialNeedsCons
   },
   data() {
@@ -333,6 +339,7 @@ export default {
       },
       showException: false,
       showSpecialNeedsCons: false,
+      showSpecialNeedsConsLook: false,
       id: null,
       currencyList: [],
       consNum: null,
@@ -553,6 +560,12 @@ export default {
       this.id = row.id
       this.consNum = row.consNum
       this.showSpecialNeedsCons = true
+    },
+    //特需查看
+    specialNeedsConsLook(row) {
+      this.id = row.id
+      this.consNum = row.consNum
+      this.showSpecialNeedsConsLook = true
     }
   }
 };