【2.0-空运】提单补料操作-出单方式没有默认选项

【2.0-报关】过机状态要改成必填

src/views/ecw/box/indexAir.vue

@@ -102,7 +102,7 @@
           <span>{{ new Date(scope.row.createTime).format('yyyy-MM-dd hh:mm:ss') }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
+      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width" width="200px">
         <template slot-scope="scope">
           <!-- <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
                      v-hasPermi="['shipment:box:query']">{{$t('查看')}}</el-button>
@@ -110,7 +110,7 @@
                      v-hasPermi="['shipment:box:update']">{{$t('修改')}}</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
                      v-hasPermi="['shipment:box:delete']">{{$t('删除')}}</el-button> -->
-          <el-dropdown trigger="click" @command="(command) => handleCommand(scope.row, command)">
+          <el-dropdown trigger="click" @command="(command) => handleCommand(scope.row, command)" style="marginRight:10px;">
             <el-button type="primary"> {{ $t('操作') }}<i class="el-icon-arrow-down el-icon--right"></i> </el-button>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="edit">{{$t('编辑')}}</el-dropdown-item>
@@ -123,6 +123,20 @@
 
             </el-dropdown-menu>
           </el-dropdown>
+          <el-dropdown trigger="click" @command="(command)=>handleCommand(scope.row, command)" v-hasPermi="['shipment:box:download:downloadPreloadGoodsList','shipment:box:download:downloadLoadGoodsList','shipment:box:download:downloadReceivableList','shipment:box:download:downloadAgentListFiles','shipment:box:download:downloadSoncapFiles','shipment:box:download:zipDownload','shipment:box:download:downloadLadingCopy']">
+            <el-button type="primary">
+              {{$t('下载')}}<i class="el-icon-arrow-down el-icon--right"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item command="downloadPreloadGoodsList" v-hasPermi="['shipment:box:download:downloadPreloadGoodsList']">{{$t('预装单')}}</el-dropdown-item>
+              <el-dropdown-item command="downloadLoadGoodsList" v-hasPermi="['shipment:box:download:downloadLoadGoodsList']">{{$t('已装单')}}</el-dropdown-item>
+              <el-dropdown-item command="downloadReceivableList" v-hasPermi="['shipment:box:download:downloadReceivableList']">{{$t('应收汇总表')}}</el-dropdown-item>
+              <el-dropdown-item command="downloadAgentListFiles" v-hasPermi="['shipment:box:download:downloadAgentListFiles']">agent list</el-dropdown-item>
+              <el-dropdown-item command="downloadSoncapFiles" v-hasPermi="['shipment:box:download:downloadSoncapFiles']">soncap</el-dropdown-item>
+              <el-dropdown-item command="zipDownload" v-hasPermi="['shipment:box:download:zipDownload']">{{$t('提货单')}}</el-dropdown-item>
+              <el-dropdown-item command="downloadLadingCopy" v-hasPermi="['shipment:box:download:downloadLadingCopy']">{{$t('提单Copy')}}</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
         </template>
       </el-table-column>
     </el-table>
@@ -472,6 +486,44 @@ export default {
           break;
           case 'batchMarkup':
             this.$router.push('batch_markup?shipmentId=' + row.id)
+            break
+          case "downloadPreloadGoodsList":
+          downloadFile(
+            command,
+            { shipmentId: row.id },
+            this.$t("预装单") + `(${row.selfNo}).xlsx`,
+            "xlsx"
+          );
+          break;
+        case "downloadLoadGoodsList":
+          downloadFile(
+            command,
+            { shipmentId: row.id },
+            this.$t("已装单") + `(${row.selfNo}).xlsx`,
+            "xlsx"
+          );
+          break;
+        case "downloadReceivableList":
+          downloadFile(
+            command,
+            { shipmentId: row.id },
+            this.$t("应收汇总表") + `(${row.selfNo}).xlsx`,
+            "xlsx"
+          );
+          break;
+        case "zipDownload":
+          downloadFile(
+            command,
+            { shipmentId: row.id },
+            this.$t("提货单") + `(${row.selfNo}).zip`,
+            "zip"
+          );
+          break;
+        case "downloadAgentListFiles":
+        case "downloadSoncapFiles":
+        case "downloadLadingCopy":
+          downloadFileByUrl(command, { shipmentId: row.id });
+          break;
         }
       if (["editLadingBill", "cost", "error"].includes(command)) {
         this.currRow = row;

src/views/ecw/box/shippingAir/nodePage/cusDeclaration.vue

@@ -234,7 +234,7 @@ export default {
           { required: true, message: this.$t("必填"), trigger: "change" },
         ],
         overMachineStatus: [
-        {pattern: /^[12]$/, message: this.$t("必填")}
+          { required: true, pattern: /^[12]$/, message: this.$t("必填")}
         ],
       },
       // 弹窗配置

src/views/ecw/box/shippingAir/nodePage/subMaterial.vue

@@ -98,6 +98,7 @@ export default {
       // 提单补料对象
       subMaterialObj: {
         markNo: "N/M",
+        issueType: '2'
       },
       // 出单方式
       method: constantDict.billingMethod,
@@ -126,7 +127,9 @@ export default {
     });
     const voName = this.$attrs.currNode.voName;
     let oldData = { ...this.shipmentObj[voName] };
-    oldData = formatNumberString(oldData, ["issueType"]);this.subMaterialObj = {
+    if(oldData.issueType == 0) oldData.issueType = 2
+    oldData = formatNumberString(oldData, ["issueType"]);
+    this.subMaterialObj = {
       ...oldData,
       packageUnit: oldData.packageUnit === 0 ? undefined : oldData.packageUnit,
     };