Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-10 5d0120d2e8a6e5cd2e1e95d4c5ffeecf5fc1c4a6

 src/views/service/serviceContract/AddServiceContractDialog.vue

@@ -39,8 +39,12 @@
                    <div class="common-select-btn" @click="selClientClick('client')">
                      <i class="el-icon-circle-plus-outline" title="选择"></i>
                    </div>
                    <div class="common-select-btn" @click="clearupClient('client')">
                      <i class="el-icon-edit-outline" title="清除"></i>
                    <div
                      v-if="editConfig.infomation.client_name && editConfig.infomation.client_name.length > 0"
                      class="common-select-btn"
                      @click="clearupClient('client')"
                    >
                      <i class="el-icon-remove-outline" title="清除"></i>
                    </div>
                  </div>
                </el-form-item>
@@ -64,7 +68,7 @@
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="联系人姓名" prop="contactId">
                <el-form-item label="联系人姓名" prop="contact_name">
                  <div class="custom-name">
                    <el-autocomplete
                      v-model="editConfig.infomation.contact_name"
@@ -79,14 +83,18 @@
                    <div class="common-select-btn" @click="selClientClick('contact')">
                      <i class="el-icon-circle-plus-outline" title="选择"></i>
                    </div>
                    <div class="common-select-btn" @click="clearupClient('contact')">
                      <i class="el-icon-edit-outline" title="清除"></i>
                    <div
                      v-if="editConfig.infomation.contact_name && editConfig.infomation.contact_name.length > 0"
                      class="common-select-btn"
                      @click="clearupClient('contact')"
                    >
                      <i class="el-icon-remove-outline" title="清除"></i>
                    </div>
                  </div>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="销售机会" prop="saleChanceId">
                <el-form-item label="销售机会" prop="sale_chance_name">
                  <div class="custom-name">
                    <el-autocomplete
                      v-model="editConfig.infomation.sale_chance_name"
@@ -101,14 +109,18 @@
                    <div class="common-select-btn" @click="selClientClick('chance')">
                      <i class="el-icon-circle-plus-outline"></i>
                    </div>
                    <div class="common-select-btn" @click="clearupClient('chance')">
                      <i class="el-icon-edit-outline"></i>
                    <div
                      v-if="editConfig.infomation.sale_chance_name && editConfig.infomation.sale_chance_name.length > 0"
                      class="common-select-btn"
                      @click="clearupClient('chance')"
                    >
                      <i class="el-icon-remove-outline"></i>
                    </div>
                  </div>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="合同订单" prop="contractId">
                <el-form-item label="合同订单" prop="contract_number">
                  <div class="custom-name">
                    <el-autocomplete
                      v-model="editConfig.infomation.contract_number"
@@ -123,14 +135,18 @@
                    <div class="common-select-btn" @click="selClientClick('contract')">
                      <i class="el-icon-circle-plus-outline" title="选择"></i>
                    </div>
                    <div class="common-select-btn" @click="clearupClient('contract')">
                      <i class="el-icon-edit-outline" title="清除"></i>
                    <div
                      v-if="editConfig.infomation.contract_number && editConfig.infomation.contract_number.length > 0"
                      class="common-select-btn"
                      @click="clearupClient('contract')"
                    >
                      <i class="el-icon-remove-outline" title="清除"></i>
                    </div>
                  </div>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="报价单" prop="quotationId">
                <el-form-item label="报价单" prop="quotation_number">
                  <div class="custom-name">
                    <el-autocomplete
                      v-model="editConfig.infomation.quotation_number"
@@ -145,17 +161,21 @@
                    <div class="common-select-btn" @click="selClientClick('quotation')">
                      <i class="el-icon-circle-plus-outline" title="选择"></i>
                    </div>
                    <div class="common-select-btn" @click="clearupClient('quotation')">
                      <i class="el-icon-edit-outline" title="清除"></i>
                    <div
                      v-if="editConfig.infomation.quotation_number && editConfig.infomation.quotation_number.length > 0"
                      class="common-select-btn"
                      @click="clearupClient('quotation')"
                    >
                      <i class="el-icon-remove-outline" title="清除"></i>
                    </div>
                  </div>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="合同类型" prop="typeId">
                <el-form-item label="合同类型" prop="serviceContractTypeId">
                  <div class="common-select">
                    <el-select
                      v-model="editConfig.infomation.typeId"
                      v-model="editConfig.infomation.serviceContractTypeId"
                      placeholder="请选择"
                      class="common-select-sel"
                      size="mini"
@@ -207,10 +227,10 @@
          <div class="basic-info-view">
            <el-row>
              <el-col :span="12">
                <el-form-item label="合同状态" prop="statusId">
                <el-form-item label="合同状态" prop="serviceContractStatusId">
                  <div class="common-select">
                    <el-select
                      v-model="editConfig.infomation.statusId"
                      v-model="editConfig.infomation.serviceContractStatusId"
                      placeholder="请选择"
                      class="common-select-sel"
                      size="mini"
@@ -460,7 +480,7 @@
        show: true,
        total: true,
        sumProp: ["Amount", "Unit", "total"],
        mergeNumber: 3
        mergeNumber: 2
      },
      editSelectClientConfig: {
        editVisible: false,
@@ -577,9 +597,11 @@
        serviceTimes: data.serviceTimes || 0,
        signTime: data.signTime || "",
        startTime: data.startTime || "",
        statusId: data.statusId || 0,
        statusId: 0,
        terms: data.terms || "",
        typeId: data.typeId || 0
        typeId: 0,
        serviceContractTypeId: data.serviceContractTypeId || 0,
        serviceContractStatusId: data.serviceContractStatusId || 0
      }
      return params
    },