任务审批流程逻辑调整

src/components/ActionBar/index.vue

@@ -58,7 +58,7 @@
         <template #title>
           <span>保存</span>
         </template>
-        <span v-if="save" class="ds-action-svg-btn" @click="saveHandle">
+        <span v-if="save && showBtns.includes('save')" class="ds-action-svg-btn" @click="saveHandle">
           <img src="../../assets/svg/save.svg" />
         </span>
       </a-tooltip>
@@ -66,7 +66,7 @@
         <template #title>
           <span>提交</span>
         </template>
-        <span v-if="submit" class="ds-action-svg-btn" @click="submitHandle">
+        <span v-if="submit && showBtns.includes('submit')" class="ds-action-svg-btn" @click="submitHandle">
           <img src="../../assets/svg/submit.svg" />
         </span>
       </a-tooltip>
@@ -74,7 +74,7 @@
         <template #title>
           <span>复制</span>
         </template>
-        <span v-if="copy" class="ds-action-svg-btn" @click="copyHandle">
+        <span v-if="copy && showBtns.includes('copy')" class="ds-action-svg-btn" @click="copyHandle">
           <img src="../../assets/svg/copy.svg" />
         </span>
       </a-tooltip>
@@ -82,7 +82,7 @@
         <template #title>
           <span>打印</span>
         </template>
-        <span v-if="code" class="ds-action-svg-btn" @click="openPrint">
+        <span v-if="code && showBtns.includes('print')" class="ds-action-svg-btn" @click="openPrint">
           <img src="../../assets/svg/print.svg" />
         </span>
       </a-tooltip>
@@ -90,7 +90,7 @@
         <template #title>
           <span>上一票</span>
         </template>
-        <span class="ds-action-svg-btn" @click="toPage('next')">
+        <span v-if="showBtns.includes('next')" class="ds-action-svg-btn" @click="toPage('next')">
           <img class="next" src="../../assets/svg/next.svg" />
         </span>
       </a-tooltip>
@@ -98,7 +98,7 @@
         <template #title>
           <span>下一票</span>
         </template>
-        <span class="ds-action-svg-btn" @click="toPage('last')">
+        <span v-if="showBtns.includes('last')" class="ds-action-svg-btn" @click="toPage('last')">
           <img src="../../assets/svg/next.svg" />
         </span>
       </a-tooltip>
@@ -167,6 +167,11 @@
         type: String,
         default: 'vertical',
       },
+      // 显示的按钮集合
+      showBtns: {
+        type: Array,
+        default: ['save', 'submit', 'copy', 'print', 'next', 'last']
+      }
     },
     emits: ['copy'],
     components: {

src/views/approve/paid/components/mainActionBar.vue

@@ -8,9 +8,6 @@
     <a-button type="link" @click="toggleSearch">{{ searchFlag? '隐藏查询' : '显示查询' }}</a-button>
     <a-button type="link" @click="apporve(1)">审核通过</a-button>
     <a-button type="link" @click="apporve(2)">驳回提交</a-button>
-    <a-model>
-      
-    </a-model>
   </div>
 </template>
 <script lang="ts" setup>

src/views/baseinfo/goods/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleAudit">
+    <BasicTable :class="{'ds-table': source == 'list', 'ds-table-detail': source == 'modal'}" @register="registerTable" @row-dbClick="handleAudit">
       <template #tableTitle>
         <a-button type="link" @click="handleCreate" :disabled="checkPermissions('op:goods:add')">
           <span class="iconfont icon-new_document"></span>
@@ -51,10 +51,10 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { ref } from 'vue'
+  import { ref, defineProps } from 'vue'
   import { Divider } from 'ant-design-vue'
   import { checkPermissions } from '/@/hooks/Permissions/index'
-  import { BasicTable, useTable, TableAction, SorterResult } from '/@/components/Table'
+  import { BasicTable, useTable, TableAction } from '/@/components/Table'
   import ImportFlow from './importFlow.vue'
   import { ApiList, ApiImport, ApiDel } from './api'
   import { useModal } from '/@/components/Modal'
@@ -62,10 +62,14 @@
   import { columns, searchFormSchema } from './columns'
   import { useMessage } from '/@/hooks/web/useMessage'
   const { notification } = useMessage()
-  let filterInfo: Partial<Recordable<string[]>> = []
-  let sortInfo: SorterResult = {}
   const visible = ref<boolean>(false)
   const refImportFlow = ref()
+  const props = defineProps({
+    source: {
+      type: String,
+      default: 'list'
+    }
+  })
   const [registerModal, { openModal }] = useModal()
   const [registerTable, { reload, getForm, getSelectRows }] = useTable({
     title: '',
@@ -118,6 +122,7 @@
     showTableSetting: true,
     bordered: true,
     showIndexColumn: true,
+    rowSelection: { type: 'checkbox' },
     indexColumnProps: {
       width: 60,
     },

src/views/operation/seaexport/api/BookingLedger.js

@@ -2110,6 +2110,15 @@ export function SetTaskStatus(data) {
   })
 }
 
+// 选择非现舱回调
+export function AutomaticBooking(data) {
+  return request({
+    url: '/opApi/SeaExportTask/AutomaticBooking',
+    method: 'post',
+    data
+  })
+}
+
 // 海运出口日志
 export function GetSeaExportLogList(params) {
   return request({

src/views/operation/seaexport/columns.tsx

@@ -823,12 +823,6 @@ export const columns: BasicColumn[] = [
     sorter: true,
     width: 150,
   },
-  {
-    dataIndex: 'goodsName',
-    title: '品名',
-    width: 150,
-    sorter: true
-  },
   {
     dataIndex: 'cargoId',
     title: '货物标识',

src/views/operation/seaexport/detail/index.vue

@@ -17,13 +17,14 @@
             <div class="main-bill-box">
               <div class="flex" style="position: relative;">
                 <ActionBar
-                  v-if="source == 'edit'"
+                  v-if="source == 'edit' || (route.query.source == 'Create' && route.query.status == 'WAIT_ORDER_AUDIT')"
                   :id="route.query.id"
                   code="sea_freight_export"
                   name="hyck"
                   :save="save"
                   :copy="copyData"
                   :submit="submit"
+                  :showBtns="(route.query.source == 'Create' && route.query.status == 'WAIT_ORDER_AUDIT') ? ['save'] : ['save', 'submit', 'copy', 'print', 'next', 'last']"
                   layout="horizontal"
                 ></ActionBar>
                 <operationArea
@@ -99,9 +100,6 @@
                   businessType="1"
                 >
                   <span>
-                    <a-button v-repeat class="mr10" v-if="route.query.source == 'Create' && route.query.status == 'WAIT_ORDER_AUDIT'" @click="save" type="primary">
-                      保存
-                    </a-button>
                     <a-button v-repeat v-if="route.query.status != 'WAIT_ORDER_AUDIT'" @click="completeTask" type="primary">
                       {{ completeText }}
                     </a-button>
@@ -193,7 +191,8 @@
     SeaExportCopy,
     SeaExportTaskAudit,
     CreateTask,
-    SetTaskStatus
+    SetTaskStatus,
+    AutomaticBooking
   } from '../api/BookingLedger'
   import { GetFormSetListByModule } from '/@/api/common'
   const appStore = useAppStore()
@@ -217,7 +216,6 @@
   
   import { useMultipleTabStore } from '/@/store/modules/multipleTab'
   import { Divider } from 'ant-design-vue'
-import { fastCall } from 'handsontable/helpers'
   
   const go = useGo()
   // 页面loading
@@ -347,6 +345,10 @@ import { fastCall } from 'handsontable/helpers'
           res.data.ctnPriceInfo = [{}]
         }
         bookingDetails.value = res.data
+        // 如果是审批页面切状态是已审单弹出选择现舱非现舱
+        if (res.data.businessStatusName == '已审单' && route.query.taskId) {
+          cvisible.value = true
+        }
         inPageLoading.value = false
         // 如果存在表单修改规则，重新更新表单
         if (res.data.formSetList && res.data.formSetList.length) {
@@ -409,7 +411,6 @@ import { fastCall } from 'handsontable/helpers'
         loading.value = false
         if (res.succeeded) {
           if (postData.id) {
-            if (!!route.query.taskId) return
             createMessage.success('保存成功!')
           } else {
             createMessage.success('新增成功!')
@@ -751,9 +752,11 @@ import { fastCall } from 'handsontable/helpers'
   const cvalue = ref(1)
   const handleOk = () => {
     if (cvalue.value == 1) {
+      // 选择现舱
       sspace.value.init()
     } else {
-      createTask('WAIT_BOOKING')
+      // 非现舱
+      AutomaticBooking({ businessId: id.value })
     }
     cvisible.value = false
   }

src/views/operation/seaexport/detail/modules/basicInfo.vue

@@ -135,7 +135,7 @@
 <script lang="ts" setup>
   import { BasicForm, useForm } from '/@/components/Form/index'
   import { basicInfoFormSchema, basicInfoFormAllSchema } from './baseInfo.tsx'
-  import { ref, watch, onMounted, reactive } from 'vue'
+  import { ref, watch, onMounted, reactive, getCurrentInstance } from 'vue'
   import { useMessage } from '/@/hooks/web/useMessage'
   import emitter from '/@/utils/Bus'
   const { createMessage } = useMessage()
@@ -217,6 +217,7 @@
       emitter.emit('seaAddNotes', item.value)
     } else if (item.key == 'customerName') {
       // 修改委托单位带出值
+      console.log(item)
       emitter.emit('customerBack', item.value)
     }
   }

src/views/operation/seaexport/detail/modules/cargoInfo.vue

@@ -37,8 +37,8 @@
           </a-col>
           <a-col :span="9">
             <BasicForm @register="registerForm2" @submit="submit">
-              <template #goodsName="{ model }">
-                <span class="iconfont icon-jichupeizhi"></span>
+              <template #goodsName>
+                <span class="iconfont icon-jichupeizhi" @click="openGoodsModel"></span>
               </template>
             </BasicForm>
           </a-col>
@@ -93,6 +93,16 @@
         </BasicForm>
       </a-col>
     </a-row>
+    <a-modal
+      :visible="visible"
+      :maskClosable="false"
+      title="品名维护"
+      width="80%"
+      :closable="false"
+      @cancel="visible = false"
+    >
+      <GoodsTable source="modal"></GoodsTable>
+    </a-modal>
   </div>
 </template>
 <script lang="ts" setup>
@@ -108,6 +118,7 @@
   import { getDictOption } from '/@/utils/dictUtil'
   import { BatchDelBusinessCtnPrice } from '/@/views/operation/seaexport/api/BookingLedger'
   import { useOptionsStore } from '/@/store/modules/options'
+  import GoodsTable from '/@/views/baseinfo/goods/index.vue'
   const optionsStore = useOptionsStore()
   const FncargoId = ref([])
   getDictOption('cargo_tag').then((res) => {
@@ -138,6 +149,11 @@
       return '普通货'
     }
   })
+  // 品名弹窗
+  const visible = ref(false)
+  const openGoodsModel = () => {
+    visible.value = true
+  }
   // 切换货物标识
   const toggleCargo = (v) => {
     console.log(v)
@@ -681,7 +697,7 @@
     }
   }
   .ctn-price-item {
-    width: 32%;
+    width: 49%;
     display: flex;
     .ant-select-selector {
       width: 66px!important;

src/views/operation/seaexport/detail/modules/goodsTable.vue

@@ -2025,7 +2025,7 @@
     }
     .htCheckboxRendererInput {
       position: relative;
-      z-index: 1111;
+      z-index: 999;
     }
   }
 }

src/views/operation/seaexport/detail/modules/rightContent.vue

@@ -462,7 +462,7 @@
     EditSeaExportRemark,
     DelSeaExportRemark
   } from '/@/views/operation/seaexport/api/BookingLedger'
-  import { ref, Ref, getCurrentInstance, watch, defineEmits, onMounted } from 'vue'
+  import { ref, Ref, watch, defineEmits, onMounted, onUnmounted } from 'vue'
   // 引入日志组件
   import DsJournal from '../components/journal.vue'
   // 引入附件上传组件
@@ -493,7 +493,6 @@
     'changeAtd',
     'openFlag'
   ])
-  let { ctx: that, proxy }: any = getCurrentInstance()
   const id = ref(route.query.id)
   // ----------------------------------------
   const RemarkList: any = ref([])
@@ -1023,6 +1022,9 @@
       })
     })
   })
+  onUnmounted(() => {
+    emitter.off('seaAddNotes')
+  })
   defineExpose({
     init,
     open

src/views/system/user/columns.tsx

@@ -27,12 +27,12 @@ export const columns: BasicColumn[] = [
   {
     title: '用户名称',
     dataIndex: 'userName',
-    width: 200,
+    width: 120,
   },
   {
     title: '用户类型',
     dataIndex: 'userType',
-    width: 200,
+    width: 120,
     customRender: ({ text }) => {
       if (text === 1) {
         return <Tag color="success">管理员</Tag>
@@ -42,15 +42,20 @@ export const columns: BasicColumn[] = [
       return text
     },
   },
+  {
+    title: '员工代码',
+    dataIndex: 'userNumber',
+    width: 120,
+  },
   {
     title: '助记码',
     dataIndex: 'pinYinCode',
-    width: 200,
+    width: 120,
   },
   {
     title: '性别',
     dataIndex: 'sex',
-    width: 200,
+    width: 120,
     customRender: ({ text }) => {
       if (text === 1) {
         return <Tag color="blue">男</Tag>
@@ -63,12 +68,12 @@ export const columns: BasicColumn[] = [
   {
     title: '手机号',
     dataIndex: 'phone',
-    width: 200,
+    width: 140,
   },
   {
     title: '电话',
     dataIndex: 'tel',
-    width: 200,
+    width: 120,
   },
   {
     title: '办公电话',
@@ -326,6 +331,13 @@ export const formSchema: FormSchema[] = [
     component: 'Switch',
     colProps: { span: 6 },
   },
+  {
+    label: '员工代码',
+    field: 'userNumber',
+    dynamicDisabled: true,
+    component: 'Input',
+    colProps: { span: 6 },
+  },
   {
     label: '航线',
     field: 'laneIds',