Merge remote-tracking branch 'origin/master'

src/views/crm/business/index.vue

@@ -495,7 +495,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      this.getOpportunityCode();
+      // this.getOpportunityCode();
       this.getListSimpleCustomer();
       this.open = true;
       this.title = "添加";

src/views/crm/customer/index.vue

@@ -478,7 +478,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      this.getCustomerCode();
+      // this.getCustomerCode();
       this.open = true;
       this.title = "添加";
     },

src/views/finance/contract/customer/index.vue

@@ -721,7 +721,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      this.getCustomerContractCode();
+      //this.getCustomerContractCode();
       this.getUser();
       this.open = true;
       this.title = "添加";

src/views/finance/contract/supplier/index.vue

@@ -707,7 +707,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      this.getSupplierContractCode();
+      // this.getSupplierContractCode();
       this.getUser();
       this.open = true;
       this.title = "添加";

src/views/oa/conversion/detail.vue

@@ -67,7 +67,7 @@
       <div class="fx-field x-grid-col-12">
         <div class="field-label">
           <span class="field-required">*</span>
-          <div class="field-name">转正申请理由</div>
+          <div class="field-name">转正理由</div>
         </div>
         <div class="field-component">
           <span :title="form.conversionReason">{{ form.conversionReason }}</span>

src/views/oa/conversion/edit.vue

@@ -27,9 +27,9 @@
           style="width: 100%;">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="转正申请理由" prop="conversionReason">
+      <el-form-item label="转正理由" prop="conversionReason">
         <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="form.conversionReason"
-          placeholder='请填写转正申请理由'></el-input>
+          placeholder='请填写转正理由'></el-input>
       </el-form-item>
 
 
@@ -173,7 +173,7 @@ export default {
           { required: true, message: '请选择日期', trigger: 'change' }
         ],
         conversionReason: [
-          { required: true, trigger: "blur", message: "请输入转正申请理由" }
+          { required: true, trigger: "blur", message: "请输入转正理由" }
         ],
         peopleList: [
           { required: true, message: '请选择审批人', }

src/views/personnel/relations/conversion/index.vue

@@ -140,9 +140,9 @@
           </el-col>
 
           <el-col :span="24">
-            <el-form-item label="申请理由" prop="conversionReason">
+            <el-form-item label="转正理由" prop="conversionReason">
         <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="form.conversionReason"
-          placeholder='请填写转正申请理由'></el-input>
+          placeholder='请填写转正理由'></el-input>
       </el-form-item>
           </el-col>
 
@@ -243,7 +243,7 @@
       <div class="fx-field x-grid-col-12">
         <div class="field-label">
           <span class="field-required">*</span>
-          <div class="field-name">转正申请理由</div>
+          <div class="field-name">转正理由</div>
         </div>
         <div class="field-component">
           <span :title="form.conversionReason">{{ form.conversionReason }}</span>
@@ -356,7 +356,7 @@ export default {
           { required: true, message: '请选择日期', trigger: 'change' }
         ],
         conversionReason: [
-          { required: true, trigger: "blur", message: "请输入转正申请理由" }
+          { required: true, trigger: "blur", message: "请输入转正理由" }
         ],
       },
     };