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

src/components/ConfigForm/index.vue

@@ -56,7 +56,7 @@
       name: {
         type: String,
         default: '',
-      }
+      },
     },
     setup(props, context) {
       const { t } = useI18n()
@@ -74,6 +74,7 @@
             required: item.required || false,
             colProps: item.colProps || { span: 24 },
             component: item.component,
+            slot: item.slot,
           }
           // 定义默认显示字段
           if (item.show !== false) {
@@ -95,8 +96,7 @@
             columns: columns,
           }),
         }
-        editCodeGoodsType(Apidata)
+        editCodeGoodsType(Apidata).then((res) => {
-          .then((res) => {
           if (res.succeeded) {
             createMessage.success('添加成功！')
           }

src/components/Print/printModal.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <a-modal :footer="false" v-model:visible="visible" title="" width="1050px" :maskClosable="false">
+        <a-modal :zIndex="1100" :footer="false" v-model:visible="visible" title="" width="1050px" :maskClosable="false">
             <div style="padding-bottom: 20px">
                 <div style="margin-bottom: 15px;padding-top: 15px;">
                     <a-button type="primary" size="small" @click="print">打印</a-button>

src/views/baseinfo/infoclient/TenantAuditStepModal.vue

@@ -165,9 +165,6 @@
                   >
                 </div>
               </template>
-              <!-- <template #description="item">
-           
-              </template> -->
               <template #description="{ model, values }">
                 <span
                   v-show="values.description"

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

@@ -63,7 +63,7 @@
                             </a-menu>
                         </template>
                     </a-dropdown>
-                    <div class="status"  >
+                    <div class="status">
                         <i class="icon-chenggong iconfont" style="font-size: 14px"></i>
                         {{ form.statusText }}
                     </div>
@@ -822,12 +822,19 @@ function openTemp() {
     })
 }
 function handleApply() {
+    if (!loading.value) {
+        loading.value = true
         ApplyAudit({ ids: [route.query.id] }).then(res => {
             if (res.succeeded) {
                 createMessage.success('操作成功')
                 getDetail()
+            } else {
+                loading.value = false
             }
+        }).catch(() => {
+            loading.value = false
         })
+    }
 }
 function handleNew() {
     go(`/invoiceapplyDetail?type=add`)
@@ -863,12 +870,20 @@ function init() {
     })
 }
 function handleWithdraw() {
+    if (!loading.value) {
+        loading.value = true
         Withdraw({ ids: [route.query.id] }).then(res => {
             if (res.succeeded) {
                 createMessage.success('操作成功')
                 getDetail()
+            } else {
+                loading.value = false
             }
+        }).catch(()=>{
+            loading.value = false
         })
+    }
+
 }
 function handleAddLabel(val) {
     tempContent.value += '[' + val.displayName + ']'
@@ -1133,7 +1148,7 @@ function mergeByCurrency(arr) {
     const result = {};
     arr.forEach(item => {
         if (result[item.currency]) {
-            result[item.currency].applyAmount +=  item.applyAmount  ;
+            result[item.currency].applyAmount += item.applyAmount;
             result[item.currency].applyAmount = Number(result[item.currency].applyAmount.toFixed(2))
         } else {
             result[item.currency] = { currency: item.currency, applyAmount: Number(item.applyAmount.toFixed(2)) };

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

@@ -77,7 +77,7 @@
             <div class="content">
                 <div class="left">
                     <div class="left-top">
-                        <div class="left-top-item" style="padding-right: 100px">
+                        <div class="left-top-item" style="padding-right: 60px">
                             <editCompent :showEdit="false" ref="editCompentRef" label="发票币别:">
                                 <template #text>
                                     <span> {{ form.currency }}</span>

src/views/taskmanage/components/pdf.vue

@@ -6,7 +6,7 @@
         <a-tab-pane :key="pdfType[0]" tab="BC文件"></a-tab-pane>
         <a-tab-pane :key="pdfType[1]" tab="BC更改文件"></a-tab-pane>
       </a-tabs>
-      <span style="margin:0 20px;font-size: 16px;font-weight: bold;color: black">{{ pdfName }}</span>
+      <span style="margin:0 20px;font-size: 16px;font-weight: bold;color: black;word-break: break-all">{{ pdfName }}</span>
       <a-button type="link" @click="handleDownPdf">
         <i class="iconfont icon-xiazai1"></i>
         下载pdf文件</a-button>

src/views/taskmanage/components/taskData.vue

@@ -274,12 +274,13 @@ function reload() {
     getInfo(taskType.value)
 }
 const router = useRouter();
+import { useGo } from '/@/hooks/web/usePage'
+const go = useGo()
 function FnSee() {
-    router.push({ path: '/BookingDetail?id=' + form.value.bookingOrderId })
+    go({ path: '/BookingDetail?id=' + form.value.bookingOrderId + '&source=edit' })
 }
-
 function FnSee1() {
-    router.push({ path: '/CabinManagementDetails?type=Edit&id=' + form.value.bookingSlotId })
+    go({ path: '/CabinManagementDetail',query: { id: form.value.bookingSlotId,type:'edit'} })
 }
 function copyText(text) {
     const inputDom = document.createElement('textarea')

src/views/taskmanage/index.vue

@@ -845,7 +845,6 @@ function handledbclick(row) {
   handleEdit(row)
 }
 function handleResetFunc() {
-  console.log('handleResetFunc')
 }
 function handleEdit(data) {
   // 当前用户id
@@ -856,8 +855,6 @@ function handleEdit(data) {
       if (item.recvUserId == userid) statusFlag = true
     })
   }
-  console.log(data, 1111111111)
-
   switch (data.tasK_TYPE) {
     case 'VGM_COMPARE':
       // VGM比对查看页面