Merge branch 'dev' of http://60.209.125.238:20010/lijingjia/ds-wms-client-web into dev

src/views/operation/paidApply/index.vue

@@ -5,43 +5,7 @@
 -->
 <template>
   <div class="ds-pay-apply">
-    <BasicTable class="ds-table" @register="registerTable" @row-dbClick="edit">
-      <template #toolbar>
-        <TableActionBar :selectRow="getSelectRows" :reload="reload" @exportFile="exportFile"></TableActionBar>
-      </template>
-      <template v-slot:bodyCell="{ column, record }">
-        <!-- 复制单号 -->
-        <template v-if="column.dataIndex == 'applicationNO'">
-          <span style="cursor: pointer"><span><span @click="copyNo($event, record.applicationNO)" class="iconfont icon-fuzhi11"></span>{{ record.applicationNO }}</span></span>
-        </template>
-        <!-- 状态 -->
-        <template v-if="column.dataIndex == 'statusText'">
-          <span v-if="record.status == 0" class="ds-blue-tag">
-            {{ record.statusText }}</span>
-          <span v-else-if="record.status == 1" class="ds-green-tag">{{
-            record.statusText
-          }}</span>
-          <span v-else-if="/^2|3|4|5|6$/.test(record.status)" class="ds-orange-tag">{{
-            record.statusText
-          }}</span>
-          <span v-else-if="/^7|8$/.test(record.status)" class="ds-red-tag">{{
-            record.statusText
-          }}</span>
-          <span v-else class="ds-purple-tag">{{ record.statusText }}</span>
-        </template>
-        <template v-if="column.key === 'action'">
-          <TableAction :actions="[
-            {
-              icon: 'clarity:note-edit-line',
-              tooltip: '编辑',
-              onClick: () => {
-                edit(record)
-              }
-            }
-          ]" />
-        </template>
-      </template>
-    </BasicTable>
+    
     <div class="calc">
       <span style="font-size: 12px;">合计</span>
       <span class="box">

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

@@ -1013,13 +1013,13 @@
     SeaExportTaskAudit(postData).then(res => {
       loading.value = false
       createMessage.success(res.message)
-      createTask(type)
+      createTask(type, true)
     }).catch(() => {
       loading.value = false
     })
   }
   // 创建任务
-  const createTask = async (type) => {
+  const createTask = async (type, b) => {
     const postData = {
       businessId: id.value,
       businessType: '1',
@@ -1030,7 +1030,7 @@
     loading.value = true
     await CreateTask(postData).then(res => {
       loading.value = false
-      createMessage.success(res.message)
+      if (!b) createMessage.success(res.message)
     }).catch(() => {
       loading.value = false
     })

src/views/system/org/APIAuthModal.vue

@@ -36,7 +36,7 @@
   const isUpdate = ref(true)
   const loading = ref(false)
   const rowId = ref('')
-  const linkId = ref('')
+  const orgId = ref('')
   const { createMessage } = useMessage()
   const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
     labelWidth: 100,
@@ -48,7 +48,7 @@
     resetFields()
     setModalProps({ confirmLoading: false, loading: true })
     isUpdate.value = !!data?.isUpdate
-    linkId.value = data.linkId ? data.linkId : ''
+    orgId.value = data.orgId ? data.orgId : ''
     if (unref(isUpdate)) {
       rowId.value = data.record.id ? data.record.id : data.record.value
       const res: API.DataResult = await getOrgAuthInfo({ id: unref(rowId) })
@@ -77,7 +77,7 @@
     try {
       const values = await validate()
       setModalProps({ confirmLoading: true, loading: true })
-      values.linkId = values.linkId ? values.linkId : linkId.value
+      values.orgId = values.orgId ? values.orgId : orgId.value
       if (values.status) {
         values.status = 0
       } else {

src/views/system/org/OrgModal.vue

@@ -334,7 +334,7 @@
       })
     },
     beforeFetch: (p) => {
-      return formatParams(p)
+      return formatParams({ ...p, orgId: rowId.value })
     },
     maxHeight: 400,
     columns: APIColumns,
@@ -355,13 +355,14 @@
       isParent: false,
       isUpdate: false,
       orgFullName: getFieldsValue().orgFullName,
-      linkId: linkId.value,
+      orgId: linkId.value,
     })
   }
   function EditAPIAuth(record: Recordable) {
     openAPIModal(true, {
       record,
       isUpdate: true,
+      orgId: linkId.value,
     })
   }
 </script>

src/views/system/org/columns.tsx

@@ -776,7 +776,7 @@ export const APIformSchema: FormSchema[] = [
   },
   {
     label: '',
-    field: 'linkId',
+    field: 'orgId',
     component: 'Input',
     defaultValue: '',
     show: false,