解决冲突

src/views/charge-query/lpjManageDetail.vue

@@ -168,7 +168,7 @@ export default {
       { title: "应收金额", dataIndex: "chargeAmount", width: 100, align: 'center' },
       { title: "折扣金额", dataIndex: "discountAmount", width: 100, align: 'center' },
       { title: "减免金额", dataIndex: "discountAmount2", width: 100, align: 'center' },
-      { title: "客户自负", dataIndex: "paidAmount", width: 100, align: 'center' },
+      { title: "客户自付", dataIndex: "paidAmount", width: 100, align: 'center' },
       { title: "理赔金额", dataIndex: "paidamount", width: 100, align: 'center' },
       // { title: "操作", key: "operation", width: "175px",fixed: "right",scopedSlots: { customRender: "operation" }},
     ];

src/views/info/components/infoDoctor.vue

 <template>
   <div class="info-doctor">
+    <div class="mar-bottom10">
+      <a-button type="primary" @click="editEvt({})">
+        <Icon name="ssiadd" :size="14" />新建医生
+      </a-button>
+    </div>
     <a-table :columns="columns" :data-source="dataList" :scroll="{ x: 'max-content' }" :pagination="false">
       <template slot="specialtyList" slot-scope="text, record">
         <span>{{ filterSpecialty(record.specialtyList) }}</span>
@@ -180,7 +185,7 @@ export default{
     },
     editEvt(record) {
       this.editFormObj = {
-        id: record.id || "",
+        id: record.id || undefined,
         doctorCode: record.doctorCode || "",
         doctorDesc: record.doctorDesc || "",
         doctorDescLang1: record.doctorDescLang1 || "",
@@ -194,8 +199,8 @@ export default{
     handleEditOK() {
       this.$refs.editForm.validate((valid) => {
         if (valid) {
-          this.$apis
-            .DOCTORUPDATE({
+          const fn = this.editFormObj.id ?  this.$apis.DOCTORUPDATE : this.$apis.DOCTORCREATE
+          fn({
               ...this.editFormObj,
               language: this.editFormObj.language.join(','),
               specialtyList: this.editFormObj.specialtyList.map((item) => {

src/views/welfare/edit/components/benefits/index.vue

@@ -93,7 +93,7 @@
               </a-input-number>
             </a-form-model-item>
           </a-col>
-          <a-col :md="12">
+          <!-- <a-col :md="12">
             <a-form-model-item label="英文描述">
               <a-input v-model="editForm.englishDesc"></a-input>
             </a-form-model-item>
@@ -102,7 +102,7 @@
             <a-form-model-item label="描述">
               <a-input v-model="editForm.loaDesc"> </a-input>
             </a-form-model-item>
-          </a-col>
+          </a-col> -->
           <!-- <a-col :md="12">
             <a-form-model-item label="状态">
               <a-select
@@ -184,7 +184,9 @@ export default {
       isBenefitEditShow: false,
       benefitData: [],
       benefitCode: [],
-      editForm: {},
+      editForm: {
+        benefitCode: []
+      },
       editRule: {
         benefitCode: [{ required: true, message: "请选择福利项" }],
         // startDate: [{ required: true, message: "请选择开始时间" }],
@@ -211,12 +213,15 @@ export default {
         corpCode: this.formData.corpCode,
         planCode: this.formData.planCode,
         coverageCode: this.formData.coverageCode,
+        benefitCode: '',
         isDirect: "N",
         status: "1",
       };
       this._getBenefitCode();
       this.editForm = this.$lodash.cloneDeep(data);
+      // this.editForm.benefitCode = this.editForm.benefitCode ? this.editForm.benefitCode.split(',') : []
       this.isBenefitEditShow = true;
+      console.log(this.editForm)
     },
     cancel() {
       this.$refs.editForm.resetFields();
@@ -233,7 +238,12 @@ export default {
         if (!valid) {
           return false;
         }
-        this._editBenefitData(this.editForm);
+        const data = {
+          ...this.editForm,
+          // benefitCode: this.editForm.benefitCode.join(',')
+
+        }
+        this._editBenefitData(data);
       });
     },
     _editBenefitData(data) {