فهرست منبع

change: cargo船货凑期.调整保存接口.非可编辑tab禁用各表单项.调整批次记录候选项禁用逻辑.

peter 1 ماه پیش
والد
کامیت
fa484cba16
1فایلهای تغییر یافته به همراه35 افزوده شده و 9 حذف شده
  1. 35 9
      src/pages/cargo-consolidation-request/index.vue

+ 35 - 9
src/pages/cargo-consolidation-request/index.vue

@@ -149,6 +149,7 @@
                   '4791186000052269001',
                 ].includes(currentUser)
               "
+              :disabled="!['Arrangement', 'my_request'].includes(currentTab)"
               style="width: 200px; height: 24px; margin-right: 10px"
               size="small"
               v-model="bookingNumber"
@@ -265,7 +266,10 @@
               filterable
               clearable
               :placeholder="scope.row.Sample ? 'Sample' : ''"
-              :disabled="scope.row.Sample"
+              :disabled="
+                scope.row.Sample ||
+                !['Arrangement', 'my_request'].includes(currentTab)
+              "
               @change="($e) => onBatchRecordChange($e, scope.$index)"
             >
               <el-option
@@ -288,6 +292,7 @@
         >
           <template #default="scope">
             <el-input
+              :disabled="!['Arrangement', 'my_request'].includes(currentTab)"
               v-model="scope.row.User_Notes"
               size="small"
               :rows="2"
@@ -302,6 +307,7 @@
         >
           <template #default="scope">
             <el-input
+              :disabled="!['Arrangement', 'my_request'].includes(currentTab)"
               v-model="scope.row.Carton"
               size="small"
               @change="scope.row.editFlag = true"
@@ -314,6 +320,7 @@
         >
           <template #default="scope">
             <el-input
+              :disabled="!['Arrangement', 'my_request'].includes(currentTab)"
               v-model="scope.row.Marks_Nos"
               size="small"
               @change="scope.row.editFlag = true"
@@ -326,6 +333,7 @@
         >
           <template #default="scope">
             <el-input
+              :disabled="!['Arrangement', 'my_request'].includes(currentTab)"
               v-model="scope.row.Description_of_Goods"
               size="small"
               @change="scope.row.editFlag = true"
@@ -338,6 +346,7 @@
         >
           <template #default="scope">
             <el-select
+              :disabled="!['Arrangement', 'my_request'].includes(currentTab)"
               v-model="scope.row.Material_of_Goods"
               size="small"
               multiple
@@ -358,6 +367,7 @@
         >
           <template #default="scope">
             <el-input
+              :disabled="!['Arrangement', 'my_request'].includes(currentTab)"
               v-model="scope.row.Quantity"
               size="small"
               @change="changeTotal(scope.row)"
@@ -370,6 +380,7 @@
         >
           <template #default="scope">
             <el-input
+              :disabled="!['Arrangement', 'my_request'].includes(currentTab)"
               v-model="scope.row.Unit_Price"
               size="small"
               @change="changeTotal(scope.row)"
@@ -402,7 +413,7 @@
             ></el-input>
           </template>
         </el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           v-show="['Arrangement', 'my_request'].includes(currentTab)"
           fixed="right"
           label="更新时间"
@@ -417,7 +428,7 @@
               }}
             </div>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column
           v-show="
             [
@@ -461,6 +472,7 @@
         >
           <template #default="scope">
             <el-input
+              :disabled="!['Arrangement', 'my_request'].includes(currentTab)"
               v-model="scope.row.Weight"
               size="small"
               @change="scope.row.editFlag = true"
@@ -474,6 +486,7 @@
         >
           <template #default="scope">
             <el-input
+              :disabled="!['Arrangement', 'my_request'].includes(currentTab)"
               v-model="scope.row.Cube"
               size="small"
               @change="scope.row.editFlag = true"
@@ -996,7 +1009,7 @@ const commit = () => {
   console.log(result, 'submit result')
   loading.value = true
   request
-    .post('/sea_freight/updateSeaFreightData', {
+    .post('/sea_freight/updateSeaFreightDataV2', {
       id: newLineTemplate.Parent_Id.id,
       Sea_Freight_array: result,
       Sales_Person: currentUserName.value,
@@ -1007,11 +1020,24 @@ const commit = () => {
     })
     .then((res) => {
       if (res.data.code === 1) {
-        ElNotification({
-          title: '保存成功',
-          message: '正在刷新数据',
-          duration: 3000,
-        })
+        let result = res.data.result || { data: [] }
+        if (
+          Array.isArray(result.data) &&
+          result.data.length &&
+          result.data.every((i: any) => i.status === 'success')
+        ) {
+          ElNotification({
+            title: '保存成功',
+            message: '正在刷新数据',
+            duration: 3000,
+          })
+        } else {
+          ElNotification({
+            title: '部份内容保存失败',
+            message: '建议刷新再试或者联系管理员',
+            duration: 10000,
+          })
+        }
         getSubList(currentRow.value)
       } else {
         ElMessage.error('保存出错')