Merge branch 'dev-zs' into test

src/views/ecw/customer/edit.vue

@@ -1285,7 +1285,7 @@ export default {
           }).then((r) => {
             this.$message.success("添加成功！")
             this.getCompetitorList(() => {
-              this.form.competitorIds = r.data
+              this.form.competitorIds = r.data.id
             })
           })
         })

src/views/ecw/offer/edit.vue

@@ -396,7 +396,7 @@
           <el-form-item :label="$t('唛头')" prop="marks">
             <el-input v-model="form.marks" placeholder="" class="w-200"></el-input>
           </el-form-item>
-          <el-form-item :label="$t('报关方式')" prop="customsType">
+          <el-form-item :label="$t('报关方式')" prop="customsType" label-width="200px">
             <dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" v-model="form.customsType" form-type="radio" defaultable />
           </el-form-item>
         </div>
@@ -405,18 +405,18 @@
             <!-- <el-date-picker v-model="form.stopTime" value-format="yyyy-MM-dd HH:mm:ss" class="w-200"></el-date-picker> -->
             <el-date-picker v-model="form.stopTime" value-format="yyyy-MM-dd" class="w-200" :picker-options="stopDate"></el-date-picker>
           </el-form-item>
-          <el-form-item :label="$t('是否控货')" prop="control">
+          <el-form-item :label="$t('是否控货')" prop="control" label-width="200px">
             <dict-selector :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" v-model="form.control" form-type="radio" />
           </el-form-item>
         </div>
         <div class="form-section">
           <el-form-item :label="$t('竞争对手')" prop="competitor">
             <el-select clearable v-model="form.competitor" :placeholder="$t('请选择')" class="w-200" @change="changeCompetitor">
-              <el-option v-for="item in competitorList" :key="item.id" :label="item.name" :value="item.id" />
+              <el-option v-for="item in competitorList" :key="item.id" :label="item.name" :value="item.name" />
               <el-option :label="$t('其他')" :value="0" />
             </el-select>
           </el-form-item>
-          <el-form-item :label="$t('重要程度')" prop="importance">
+          <el-form-item :label="$t('重要程度')" prop="importance" label-width="200px">
             <el-rate v-model="form.importance"></el-rate>
           </el-form-item>
         </div>
@@ -442,7 +442,7 @@
         </div>
         <div class="form-section">
           <el-form-item :label="$t('备注')" :span="2">
-            <el-input v-model="form.remarks" type="textarea" placeholder="" style="width: 500px; height: 100px"></el-input>
+            <el-input v-model="form.remarks" type="textarea" placeholder="" style="width: 410px; height: 100px"></el-input>
           </el-form-item>
         </div>
       </el-card>
@@ -1451,7 +1451,7 @@ export default {
             competitorListAll().then((res) => {
               this.competitorList = res.data
               this.$nextTick(() => {
-                this.form.competitor = r.data
+                this.form.competitor = r.data.name
               })
             })
           })