askbot-dragon 0.9.28 → 0.9.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "askbot-dragon",
-  "version": "0.9.28",
+  "version": "0.9.30",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

package/src/components/formTemplate.vue

@@ -15,7 +15,7 @@
             <span v-if="item.fieldId!=='workorder_description'&&item.fieldId!=='workorder_clientId'">{{item.formField.name}}</span>
             <span v-if="item.fieldId==='workorder_description'">问题描述</span>
             <span v-if="item.fieldId==='workorder_clientId'">报单人</span>
-            <span style="color: red;padding-left: 5px;padding-right: 5px" v-if="item.required || isRequiredFn(item.formField)">*</span>
+            <span style="color: red;padding-left: 5px;padding-right: 5px" v-if="item.fieldId !== '0feca81fce97465da537248c066e4db8' && item.fieldId !=='1d8bd21485834773a6d18eae60013000' && (item.required || isRequiredFn(item.formField))">*</span>
             <el-tooltip class="item" effect="dark" placement="right-start">
               <div slot="content">{{item.formField.remark && item.formField.remark.text}}</div>
               <span v-if="item.formField.remark&&item.formField.remark.enable">
@@ -623,7 +623,7 @@
               :label=item.formField.name
               :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择'"
               @click="openDrawer(item,'cascader')"
-              :required="item.required || isRequiredFn(item.formField)"
+              :required="item.fieldId !== '0feca81fce97465da537248c066e4db8' && item.fieldId !=='1d8bd21485834773a6d18eae60013000' && (item.required || isRequiredFn(item.formField))"
               :disabled="disableds"
               right-icon="van-icon van-icon-arrow van-cell__right-icon"
           >
@@ -1952,14 +1952,14 @@ export default {
 
         }
         let isRequired = true;
-        if (this.mainId == '3e83057a1bd74b79b86859ad619fdbbb' || this.mainId == 'ab0f90737c8b4f2d85ba2157e4473110'){
+        if (this.mainId == '3e83057a1bd74b79b86859ad619fdbbb' || this.mainId == 'ab0f90737c8b4f2d85ba2157e4473110' || this.mainId == '86dc09da570948d2b4841122d732f373'){
           isRequired = false
         }
         /*针对蒙牛企业在对话中系统名称字段暂时不做校验*/
         if(this.formShow.form.formFieldRelation[i].display &&
             (this.formShow.form.formFieldRelation[i].required || this.isRequiredFn(this.formShow.form.formFieldRelation[i].formField)) &&
             this.formShow.form.formFieldRelation[i].fieldId!=='workorder_name'&&
-            ((!isRequired && this.formShow.form.formFieldRelation[i].fieldId !== '0feca81fce97465da537248c066e4db8') || isRequired) &&
+            ((!isRequired && this.formShow.form.formFieldRelation[i].fieldId !== '0feca81fce97465da537248c066e4db8' && this.formShow.form.formFieldRelation[i].fieldId !=='1d8bd21485834773a6d18eae60013000') || isRequired) &&
             this.formShow.form.formFieldRelation[i].formField.type !== 'EXPLANATION') {
           let value = "";
           let bool = {}