2024-05-23-4提交

src/api/ecw/customerContacts.js

@@ -59,6 +59,15 @@ export function getCustomerContactsSelect(query) {
     params: query
   })
 }
+
+export function getCustomerContactsSelect2(query) {
+  return request({
+    url: '/ecw/customer-contacts/select2',
+    method: 'get',
+    params: query
+  })
+}
+
 // 导出客户联系人 Excel
 export function exportCustomerContactsExcel(query) {
   return request({

src/components/ChooseContactDialog/index.vue

@@ -62,7 +62,10 @@
   </el-dialog>
 </template>
 <script>
-import { getCustomerContactsSelect } from "@/api/ecw/customerContacts";
+import {
+  getCustomerContactsSelect,
+  getCustomerContactsSelect2,
+} from "@/api/ecw/customerContacts";
 export default {
   props: {
     type: Number,
@@ -89,11 +92,18 @@ export default {
       this.loadList();
     },
     loadList() {
-      //加载联系人数据
-      getCustomerContactsSelect(this.form).then((res) => {
-        this.list = res.data.list;
-        this.total = res.data.total;
-      });
+      //加载联系人数据,怎样使用属性
+      if (this.type == "1") {
+        getCustomerContactsSelect2(this.form).then((res) => {
+          this.list = res.data.list;
+          this.total = res.data.total;
+        });
+      } else {
+        getCustomerContactsSelect(this.form).then((res) => {
+          this.list = res.data.list;
+          this.total = res.data.total;
+        });
+      }
     },
     closeDialog() {
       this.show = false;

src/views/ecw/box/query.vue

@@ -228,13 +228,14 @@
                 :label="$t('报关费用')"
                 align="center"
               ></el-table-column>
+              <!--
               <el-table-column
                 prop=""
                 :label="$t('异常操作')"
                 align="center"
                 width="120px"
               >
-                <!--lanbm 2024-05-23 添加异常登记功能-->
+              lanbm 2024-05-23 添加异常登记功能
                 <template slot-scope="scope">
                   <el-button
                     type="primary"
@@ -243,7 +244,8 @@
                     >{{ $t("异常登记") }}</el-button
                   >
                 </template>
-              </el-table-column>
+              </el-table-column>-->
+              
               <el-table-column
                 prop=""
                 :label="$t('操作')"
@@ -492,7 +494,6 @@
         </el-tabs>
       </el-col>
     </el-row>
-
     <!-- 对话框(添加 / 修改) -->
     <el-dialog
       :title="dialogConfig.title"
@@ -538,6 +539,23 @@
         />
       </template>
     </el-dialog>
+
+    <!-- 对话框 lanbm 2024-05-23 add异常登记对话框 -->
+    <el-dialog
+      custom-class="shipping-dialog"
+      :title="$t('异常')"
+      :visible.sync="dialogVisible"
+      width="600px"
+      :modal-append-to-body="false"
+      append-to-body
+    >
+      <unloadingError
+        v-if="dialogVisible"
+        @closeDialog="closeDialog_2"
+        v-bind="$attrs"
+        :currRow="currRow"
+      />
+    </el-dialog>
   </div>
 </template>
 
@@ -570,6 +588,7 @@ import updateError from "./updateError.vue";
 import { listUser } from "@/api/system/user";
 //lanbm 2024-05-16 add
 import { getCurrencyList } from "@/api/ecw/currency";
+import unloadingError from "@/views/ecw/box/shippingSea/nodePage/unloading/unloadingError.vue";
 
 export default {
   name: "EcwBoxQuery",
@@ -581,6 +600,8 @@ export default {
     regError,
     editForm,
     updateError,
+    //lanbm 2024-05-23 异常登记对话框
+    unloadingError,
   },
   created() {
     this.transportTypes = this.getDictDatas(
@@ -693,6 +714,9 @@ export default {
       },
       //币种信息 lanbm 2024-05-16 add
       currencyList: [],
+      // 当前行
+      currRow: {},
+      dialogVisible: false,
     };
   },
   methods: {
@@ -712,11 +736,14 @@ export default {
     handleSelectionChange(selected) {
       this.selectedRows = selected;
     },
+    closeDialog_2() {
+      //关闭异常对话框
+      this.dialogVisible = false;
+    },
     updateStatus_2(type, row) {
       //lanbm 2024-05-23 添加的异常登记功能
-      this.$set(this.dialogConfig, "visible", true);
-      this.$set(this.dialogConfig, "title", this.$t("异常登记"));
-      this.$set(this.dialogConfig, "type", "error");
+      this.currRow = row;
+      this.dialogVisible = true;
     },
     /* 更新状态 */
     updateStatus(type, row) {

src/views/ecw/box/queryAir.vue

@@ -274,6 +274,7 @@
                 :label="$t('报关费用')"
                 align="center"
               ></el-table-column>
+              <!--
               <el-table-column
                 prop=""
                 :label="$t('异常操作')"
@@ -289,7 +290,8 @@
                     >{{ $t("异常登记") }}</el-button
                   >
                 </template>
-              </el-table-column>
+              </el-table-column>-->
+              
               <el-table-column
                 prop=""
                 :label="$t('操作')"

src/views/ecw/financial/voucher.vue

@@ -77,6 +77,7 @@
             <el-button type="primary" @click="handleQuery">{{
               $t("查找")
             }}</el-button>
+            <!--
             <el-button type="primary" @click="handleQuery2">{{
               $t("批量反审核")
             }}</el-button>
@@ -85,7 +86,8 @@
             }}</el-button>
             <el-button type="primary" @click="handleQuery3">{{
               $t("批量核销")
-            }}</el-button>
+            }}</el-button>-->
+            
           </el-form-item>
         </el-row>
       </el-form>

src/views/ecw/offer/edit.vue

@@ -909,6 +909,7 @@
 
     <choose-contact-dialog
       v-if="!!contactChooseType"
+      :type="1"
       @choose="onContactChoose"
       @close="contactChooseType = null"
     />

src/views/ecw/order/edit.vue

@@ -626,7 +626,7 @@
             </div>
         </el-dialog>
 
-        <choose-contact-dialog v-if="!!contactChooseType" @choose="onContactChoose" @close="contactChooseType=null"  />
+        <choose-contact-dialog v-if="!!contactChooseType" :type="2" @choose="onContactChoose" @close="contactChooseType=null"  />
         <quick-create-customer v-if="quickCreateType" :type="quickCreateType" @success="onContactChoose" @close="quickCreateType=null" />
   </div>
 </template>