Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/utils/dict.js

@@ -148,7 +148,7 @@ export const DICT_TYPE = {
 
   ECASH_INIT:'ecash_init', //e-cash
   FEE_TYPE:'fee_type',
-  PAY_TYPE:'pay_type',
+  // PAY_TYPE:'payment_type',
   RECEIVE_FLAG:'receive_flag',
   COMDINED_VALUE_ADDED_FEE:'combined_value_added_fee',
   ORDER_SPECIAL_NEEDS:'order_special_needs',

src/views/ecw/order/components/specialNeeds.vue

@@ -18,7 +18,7 @@
         </el-form-item>
         <el-form-item label="付款类型" v-if="form.advanceType == 6">
          <div style="width: 300px;">
-           <dict-selector v-model="form.payType"  :type="DICT_TYPE.PAY_TYPE" ></dict-selector>
+           <dict-selector v-model="form.payType"  :type="DICT_TYPE.PAYMENT_TYPE" ></dict-selector>
          </div>
         </el-form-item>
       </el-form>

src/views/ecw/order/feeApplication.vue

@@ -30,7 +30,7 @@
        </el-table-column>
        <el-table-column label="付款类型">
          <template v-slot = {row}>
-           <dict-selector  :disabled="isModify[forbidden(row)]" :type="DICT_TYPE.PAY_TYPE" v-model="row.payType" />
+           <dict-selector  :disabled="isModify[forbidden(row)]" :type="DICT_TYPE.PAYMENT_TYPE" v-model="row.payType" />
          </template>
        </el-table-column>
        <el-table-column label="备注">

src/views/system/sms/smsTemplate.vue

@@ -236,9 +236,9 @@ export default {
         code: [{ required: true, message: "模板编码不能为空", trigger: "blur" }],
         name: [{ required: true, message: "模板名称不能为空", trigger: "blur" }],
         content: [{ required: true, message: "模板内容不能为空", trigger: "blur" }],
-        contentEn: [{ required: true, message: "英文模板内容不能为空", trigger: "blur" }],
+        contentEn: [{ required: false, message: "英文模板内容不能为空", trigger: "blur" }],
         apiTemplateId: [{ required: true, message: "中文短信API的模板编号不能为空", trigger: "blur" }],
-        apiTemplateIdEn: [{ required: true, message: "英文短信API的模板编号不能为空", trigger: "blur" }],
+        apiTemplateIdEn: [{ required: false, message: "英文短信API的模板编号不能为空", trigger: "blur" }],
         channelId: [{ required: true, message: "短信渠道编号不能为空", trigger: "change" }],
       },
       // 短信渠道