清除合并冲突

src/views/ecw/customer/components/customerFollowUpdateStatus.vue

@@ -3,13 +3,13 @@
     center
     :title="$t('修改跟进状态')"
     :visible="show"
-    @close="close"
+    @close="customerFollowUpdateStatusClose"
     width="30%">
     <div style="width: 100%;min-height: 60px;text-align: center">
       <el-form label-width="120px">
         <el-col :span="20">
           <el-form-item :label="$t('跟进状态')">
-            <el-select  v-model="status" :placeholder="$t('请选择')" size="small">
+            <el-select v-model="status" :placeholder="$t('请选择')" size="small">
               <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_FOLLOWUP_STATUS)" :key="dict.value"
                          :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)"/>
             </el-select>
@@ -29,7 +29,7 @@
 
 <script>
 import {DICT_TYPE, getDictDatas, getDictDatas2} from "@/utils/dict";
-import {updateCustomerFollowupStatus} from "@/api/ecw/customerFollow";
+import {getCustomerFollowList, updateCustomerFollowupStatus} from "@/api/ecw/customerFollow";
 
 export default {
   name: "customerFollowUpdateStatus",
@@ -70,21 +70,25 @@ export default {
         status: this.status
       }).then(r => {
         if (r.code === 0) {
-          if (r.data) {
-            this.$message.success(r.data)
-            this.$emit('update:show', false)
-            this.$emit('update:followupIds', [])
-            this.status = '';
-          } else {
-            this.$emit('update:show', false)
-            this.$emit('update:followupIds', [])
-            this.status = null;
-            this.$message.success(this.$t('修改成功！'))
-          }
+          this.$message.success(this.$t('修改成功！'))
+          this.$emit("refresh")
+          this.customerFollowUpdateStatusClose()
         }
+
+      })
+    },
+    getCustomerFollowList() {
+      this.loading = true
+      getCustomerFollowList({
+        ...this.followForm,
+        ...this.formatQuery()
+      }).then((r) => {
+        this.customerFollowList = r.data.list
+        this.customerFollowTotal = r.data.total
+        this.loading = false
       })
     },
-    close() {
+    customerFollowUpdateStatusClose() {
       this.status = null;
       this.$emit('update:show', false)
 

src/views/ecw/offer/logListCommon.vue

@@ -124,7 +124,7 @@
       <pagination :total="customerFollowTotal" :page.sync="followForm.pageNo" :limit.sync="followForm.pageSize" @pagination="getCustomerFollowList" />
     </el-card>
     <customer-follow ref="customerFollow" @close="customerFollowVisible = false" @handleCustomerFollowAdd="handleCustomerFollowAdd" @refresh="handleQuery" v-if="customerFollowVisible" :customer-id="customerId" :customerService="customerService" :customerNumber="customerNumber" />
-    <customer-follow-update-status :show.sync="updateStatus" :followup-ids.sync="selectCustomerFollowList"></customer-follow-update-status>
+    <customer-follow-update-status :show.sync="updateStatus" :followup-ids.sync="selectCustomerFollowList" @refresh="handleQuery"></customer-follow-update-status>
   </div>
 </template>
 

src/views/ecw/order/feeApplication.vue

@@ -33,7 +33,7 @@
         >
         <el-form-item>
           <el-button
-            :disabled="!!processInstanceId || editMode"
+            :disabled="!!processInstanceId "
             @click="addCost"
           >{{ $t("添加申请") }}
           </el-button
@@ -119,7 +119,7 @@
             <!--el-button type="text" v-if="scope.row.status == 1" @click="examineFn">{{$t('审核中')}}</el-button-->
             <el-button
               type="text"
-              v-if="modifable(scope.$index)"
+              v-if="scope.row.id && modifable(scope.row)"
               @click="modify(scope.row)"
             >{{ $t("修改") }}
             </el-button
@@ -225,7 +225,8 @@ export default {
       return this.$i18n.locale === "zh_CN";
     },
     feeList() {
-      return this.list.filter((item) => item.status === 0);
+      // return this.list.filter((item) => item.status === 0);
+      return this.list;
     },
     // 正在编辑的费用申请
     currentItem() {
@@ -236,13 +237,13 @@ export default {
       return !!this.currentItem;
     },
     modifable() {
-      return (index) => {
+      return (item) => {
         // 审核中不允许修改
         if (this.processInstanceId) return false;
         // 有未提交的不允许修改
-        if (this.feeList.length) return false;
-        // 有修改中的不允许修改
-        if (this.list.findIndex((item) => item.editMode) > -1) return false;
+        // if (this.feeList.length) return false;
+        // 修改中的不允许修改
+        if (item.editMode) return false;
         return true;
       }
     }
@@ -317,18 +318,18 @@ export default {
       if (errList.length) {
         return this.$message.error("请填写完整费用申请信息");
       }
-      if (this.editMode) {
-        // 要提交status=1,否则保持原状态
-        const data = {
-          ...this.currentItem,
-          status: 1,
-          copyUserId: this.selectedUsers,
-        };
-        return applicationUpdate(data).then((r) => {
-          this.$message.success(this.$t("修改成功"));
-          this.$emit("update:dialogVisible", false);
-        });
-      }
+      // if (this.editMode) {
+      //   // 要提交status=1,否则保持原状态
+      //   const data = {
+      //     ...this.currentItem,
+      //     status: 1,
+      //     copyUserId: this.selectedUsers,
+      //   };
+      //   return applicationUpdate(data).then((r) => {
+      //     this.$message.success(this.$t("修改成功"));
+      //     this.$emit("update:dialogVisible", false);
+      //   });
+      // }
 
       feeApplicationCreateBatch({
         orderFeeApplicationCreateReqVOList: this.feeList,
@@ -339,6 +340,7 @@ export default {
           this.$emit("update:dialogVisible", false);
           this.$message.success(this.$t("添加成功"));
           this.selectedUsers = [];
+          this.$emit("refresh")
         }
       });
     },

src/views/ecw/order/index.vue

@@ -589,7 +589,7 @@
     <batch-pickup v-if="showBatchPickup" @close="onBatchClose" @success="onBatchClose" />
     <withdrawal v-if="show" :dialog-visible="show" :orderId="orderId"></withdrawal>
     <batch-single-application @getList="getList" :order-list="orderId" :dialog-visible.sync="warehouseBol"></batch-single-application>
-    <fee-application v-if="feeApplicationBol" :order-id="orderId" :currencys="JSON.stringify(currencyList)" :dialog-visible.sync="feeApplicationBol"></fee-application>
+    <fee-application v-if="feeApplicationBol" :order-id="orderId" :currencys="JSON.stringify(currencyList)" :dialog-visible.sync="feeApplicationBol "@refresh="getList"></fee-application>
     <merge-log :order-no="showMergedLogOrderNo" v-if="showMergedLogOrderNo !== null" @close="showMergedLogOrderNo = null" />
     <pickup-log v-if="showPickupLogOrderNo" :order-no="showPickupLogOrderNo" @close="showPickupLogOrderNo = null" @delete="getList" />
     <SplitRevoke

src/views/ecw/productPrice/blacklist.vue

@@ -986,6 +986,11 @@ export default {
     resetQuery() {
       this.dateRangeCreateTime = [];
       this.resetForm("queryForm");
+
+      this.destCountryId = null
+      this.destWarehouseId = null
+      this.objectiveId = null
+
       this.handleQuery();
     },
     /** 新增按钮操作 */