Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuanFront

src/api/modular/gen/codeGenerateManage.js

@@ -12,7 +12,7 @@ import { axios } from '@/utils/request'
  * @author yubaoshan
  * @date 2020/12/23 15:00
  */
-export function codeGeneratePage (parameter) {
+export function codeGeneratePage(parameter) {
   return axios({
     url: '/codeGenerate/page',
     method: 'get',
@@ -26,7 +26,7 @@ export function codeGeneratePage (parameter) {
  * @author yubaoshan
  * @date 2020/12/23 15:00
  */
-export function codeGenerateAdd (parameter) {
+export function codeGenerateAdd(parameter) {
   return axios({
     url: '/codeGenerate/add',
     method: 'post',
@@ -40,7 +40,7 @@ export function codeGenerateAdd (parameter) {
  * @author yubaoshan
  * @date 2020/12/23 15:00
  */
-export function codeGenerateEdit (parameter) {
+export function codeGenerateEdit(parameter) {
   return axios({
     url: '/codeGenerate/edit',
     method: 'post',
@@ -54,7 +54,7 @@ export function codeGenerateEdit (parameter) {
  * @author yubaoshan
  * @date 2020/12/23 15:00
  */
-export function codeGenerateDelete (parameter) {
+export function codeGenerateDelete(parameter) {
   return axios({
     url: '/codeGenerate/delete',
     method: 'post',
@@ -68,7 +68,7 @@ export function codeGenerateDelete (parameter) {
  * @author yubaoshan
  * @date 2020/12/23 15:00
  */
-export function codeGenerateInformationList (parameter) {
+export function codeGenerateInformationList(parameter) {
   return axios({
     url: '/codeGenerate/InformationList',
     method: 'get',
@@ -83,7 +83,7 @@ export function codeGenerateInformationList (parameter) {
  * @param {*} tableName 表名
  * @return {*}
  */
-export function codeGenerateColumnList (tableName) {
+export function codeGenerateColumnList(tableName) {
   return axios({
     url: `/codeGenerate/ColumnList/${tableName}`,
     method: 'get'
@@ -96,7 +96,7 @@ export function codeGenerateColumnList (tableName) {
  * @author yubaoshan
  * @date 2020/12/23 15:00
  */
-export function codeGenerateRunLocal (parameter) {
+export function codeGenerateRunLocal(parameter) {
   return axios({
     url: '/codeGenerate/runLocal',
     method: 'post',
@@ -110,7 +110,7 @@ export function codeGenerateRunLocal (parameter) {
  * @author yubaoshan
  * @date 2020/12/23 15:00
  */
-export function codeGenerateRunDown (parameter) {
+export function codeGenerateRunDown(parameter) {
   return axios({
     url: '/codeGenerate/runDown',
     method: 'get',

src/api/modular/main/TaskmanageList.js

@@ -309,7 +309,8 @@ export function DownloadFile(parameter) {
   return axios({
     url: '/TaskManageBC/DownloadFile',
     method: 'get',
-    params: parameter
+    params: parameter,
+    responseType: 'arraybuffer'
   })
 }
 export function TransferTask(parameter) {

src/views/main/Taskmanage/BcFileDetail/Editing.vue

@@ -2,7 +2,7 @@
   <div class="Main">
     <a-spin :spinning="spinning">
       <a-row :gutter="16">
-        <a-col :span="14">
+        <a-col :span="10">
           <div class="LeftHead">
             <p>Booking Confirmation（{{ form.carrierId }}）</p>
             <p>订舱时间：{{ form.bookingConfirmDate }}</p>
@@ -339,7 +339,7 @@
             </a-row>
           </a-form>
         </a-col>
-        <a-col :span="10" class="rightBox">
+        <a-col :span="14" class="rightBox">
           <iframe width="100%" height="720" frameborder="0" scrolling="auto" :src="pdfUrl"></iframe>
         </a-col>
       </a-row>
@@ -378,7 +378,7 @@
                 @search="SearchCustomer"
                 @change="ChangeCustomer"
               >
-                <a-select-option v-for="(item, index) in CustomerList" :key="index" :value="item.codeName">
+                <a-select-option v-for="(item, index) in CustomerList" :key="index" :value="item.id">
                   {{ item.shortName }}
                 </a-select-option>
               </a-select>
@@ -555,7 +555,15 @@
     <a-modal v-model="UserVisible" title="转移任务" @ok="UserhandleOk">
       <a-form>
         <a-form-item label="接收人：" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1">
-          <a-select v-model="UserId" style="width: 120px">
+          <a-select
+            show-search
+            v-model="UserId"
+            :default-active-first-option="false"
+            :show-arrow="false"
+            :filter-option="false"
+            :not-found-content="null"
+            @search="SearchUser"
+          >
             <a-select-option v-for="item in UserList" :key="item.id" :value="item.id">
               {{ item.name }}
             </a-select-option>
@@ -584,8 +592,8 @@ export default {
       UserId: '',
       value: '',
       formItemLayout: {
-        labelCol1: { span: 5 },
+        labelCol1: { span: 6 },
-        wrapperCol1: { span: 19 },
+        wrapperCol1: { span: 18 },
         labelCol2: { span: 8 },
         wrapperCol2: { span: 16 },
         labelCol3: { span: 4 },
@@ -629,7 +637,7 @@ export default {
     },
     ChangeCustomer(e) {
       this.CustomerList.forEach(item => {
-        if (item.codeName == e) {
+        if (item.id == e) {
           this.CreateData.customerName = item.shortName
         }
       })
@@ -664,7 +672,10 @@ export default {
       })
     },
     FnCancelTask() {
-      CancelTaskBC().then(res => {
+      const ApiData = {
+        taskPKId: this.$route.query.taskPKId
+      }
+      CancelTaskBC(ApiData).then(res => {
         if (res.data.succ) {
           this.$message.success(res.data.msg)
         } else {
@@ -678,7 +689,7 @@ export default {
     getList() {
       this.spinning = true
       const ApiData = {
-        taskPkId: this.$route.query.taskPKId
+        taskPKId: this.$route.query.taskPKId
       }
       GetInfoByTaskId(ApiData).then(res => {
         console.log(res.data)
@@ -710,6 +721,8 @@ export default {
       })
       DownloadFile(ApiData).then(res => {
         this.pdfUrl = window.URL.createObjectURL(new Blob([res], { type: 'application/pdf;charset=utf-8' }))
+        // this.pdfUrl = window.URL.createObjectURL(new Blob([res], { type: 'text/plain;charset=utf-8' }))
+        console.log(this.pdfUrl)
       })
       GetSysUserPage().then(res => {
         this.UserList = res.data
@@ -720,8 +733,10 @@ export default {
     },
     OpenModal() {
       this.visible = true
+      this.CreateData = {}
     },
     OpenUser() {
+      this.UserId = ''
       this.UserVisible = true
     },
     handleOk() {
@@ -734,8 +749,8 @@ export default {
 
       let ApiData = {
         bcTaskId: this.$route.query.taskPKId,
-        bcPkId: '',
+        // bcPkId: '',
-        slotId: '',
+        // slotId: '',
         projectList,
         ...this.CreateData
       }
@@ -751,7 +766,7 @@ export default {
     },
     UserhandleOk() {
       const ApiData = {
-        taskPkId: this.$route.query.taskPKId,
+        taskPKId: this.$route.query.taskPKId,
         userId: this.UserId
       }
       TransferTask(ApiData).then(res => {
@@ -766,16 +781,16 @@ export default {
     },
     Rcolor(hexColor) {
       let hex = hexColor.replace('#', '').toLowerCase()
-      let red = parseInt(hex.substring(0, 2), 16) - 80
+      let red = parseInt(hex.substring(0, 2), 16) - 90
-      let green = parseInt(hex.substring(2, 4), 16) - 80
+      let green = parseInt(hex.substring(2, 4), 16) - 90
-      let blue = parseInt(hex.substring(4, 6), 16)
+      let blue = parseInt(hex.substring(4, 6), 16) - 50
       return `rgb(${red}, ${green}, ${blue})`
     }
   }
 }
 </script>
 <style lang="less" scoped>
-@import url('../../BookingLedger/detail/index.less');
+// @import url('../../BookingLedger/detail/index.less');
 @import url('../../BookingLedger/detail/style/rightContent.less');
 .modaltitle {
   border-bottom: 1px solid #000;
@@ -787,7 +802,7 @@ export default {
   color: '#02A7F0';
 }
 .Main {
-  width: 80%;
+  width: 98%;
   margin: 0 auto;
 
   .LeftHead {
@@ -825,6 +840,7 @@ export default {
         // border: 1px solid rgba(170, 10, 0, 1);
         border-radius: 3px;
         box-shadow: none;
+        // font-weight: bold;
         // color: #62a10398;
         margin: 0.5rem;
         padding: 0 0.3rem;