askbot-dragon 0.6.13 → 0.6.17

package/package.json

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

package/src/components/ConversationContainer.vue

@@ -670,9 +670,9 @@ export default {
                   WebHookParameter: [],
                   value: [],
                   option: [
-                    { _default: "true", label: "1", value: "" },
+                    { _default: "true", label: "1", value: "1" },
                     { _default: "false", label: "2", value: "选项二" },
-                    { _default: "false", label: "3", value: "" },
+                    { _default: "false", label: "3", value: "3" },
                   ],
                 },
               },
@@ -891,6 +891,46 @@ export default {
               required: true,
               value: null,
             },
+            {
+              display: true,
+              fieldId: "workorder_description",
+              formField: {
+                createTime: null,
+                updateTime: "2020-12-10T16:12:33.544",
+                id: "5fd1d87127d6601a879b49bbcccc",
+                name: "工单描述",
+                description: "",
+                type: "TEXTAREA",
+                operatorId: "12",
+                mainId: "6cdfcac6a7d611eabdcd506b4b2f3acccc",
+                searchable: true,
+                extInfo:null
+              },
+              width: 0,
+              required: true,
+              value: null,
+            },
+            {
+              display: true,
+              fieldId: "workorder_clientId",
+              formField: {
+                createTime: null,
+                updateTime: "2020-12-10T16:12:33.544",
+                id: "5fd1d87127d6601a879b49bbccccd'd",
+                name: "客户",
+                description: "",
+                type: "SELECT",
+                operatorId: "12",
+                mainId: "6cdfcac6a7d611eabdcd506b4b2f3acccc",
+                searchable: true,
+                extInfo:{
+                  options:[]
+                }
+              },
+              width: 0,
+              required: true,
+              value: null,
+            },
             {
               display: true,
               fieldId: "5fd1d87127d6601a879b49bbccc",
@@ -906,34 +946,31 @@ export default {
                 searchable: true,
                 extInfo: {
                   exinfo: [],
-                  cascadeDown: [
+                  cascade:[
                     {
-                      style: "1",
-                      options: [
+                      value: "是",
+                      label: "是",
+                      children: [
                         {
-                          value: "是",
-                          label: "是",
-                          children: [
-                            {
-                              value: "北京",
-                              label: "北京",
-                              children:[
-                                {label:'北京一',value:'北京一'}
-                              ]
-                            },
-                            {
-                              value: "天津",
-                              label: "天津",
-                            },
-                          ],
+                          value: "北京",
+                          label: "北京",
+                          children:[
+                            {label:'北京一',value:'北京一'}
+                          ]
                         },
                         {
-                          value: "飒飒",
-                          label: "飒飒"
+                          value: "天津",
+                          label: "天津",
                         },
                       ],
                     },
+                    {
+                      value: "飒飒",
+                      label: "飒飒"
+                    },
                   ],
+                  placeholder:'请选择级联'
+
                 },
               },
               width: 0,
@@ -994,6 +1031,7 @@ export default {
                     { value: "chifan", label: "吃饭", _default: "false" },
                     { value: "shuijiao", label: "睡觉", _default: "true" },
                   ],
+                  placeholder:'请选择下拉'
                 },
               },
               width: 0,
@@ -1096,7 +1134,7 @@ export default {
                 extInfo:{
                   isDelete:true,
                   visibleWithoutPermission:false,
-                  url:""
+                  url:"https://www.runoob.com/tags/html-colorpicker.html"
                 },
                 name:'"说明文字"',
                 type:'EXPLAIN'
@@ -1151,7 +1189,7 @@ export default {
               },
               paramName:"fieldValue.1adcfd3d0c494dcaba5c469ee8252e3f",
               required:false,
-              value:''
+              value:'选项二'
             },
             {
               display:true,
@@ -1183,7 +1221,7 @@ export default {
               },
               paramName:"fieldValue.1adcfd3d0c494dcaba5c469ee8252e3f",
               required:false,
-              value:''
+              value:'选项一'
             },
             {
               display:true,
@@ -1215,7 +1253,7 @@ export default {
               },
               paramName:"fieldValue.1adcfd3d0c494dcaba5c469ee8252e3f",
               required:false,
-              value:[]
+              value:['选项一','选项二']
             },
             {
               display:true,
@@ -1224,7 +1262,8 @@ export default {
                 extInfo:{
                   isDelete:true,
                   visibleWithoutPermission:false,
-                 mold:'DATA'
+                 mold:'DATA',
+                  placeholder:'请选择时间日期'
                 },
                 name:'时间日期',
                 type:'TIME_PICKER'
@@ -1240,7 +1279,8 @@ export default {
                 extInfo:{
                   isDelete:true,
                   visibleWithoutPermission:false,
-                  mold:'DATA_TIME'
+                  mold:'DATA_TIME',
+                  placeholder:'请选择'
                 },
                 name:'时间日期',
                 type:'TIME_PICKER'
@@ -1248,8 +1288,49 @@ export default {
               paramName:"fieldValue.1adcfd3d0c494dcaba5c469ee8252e3f",
               required:false,
               value:''
-            }
-
+            },
+            {
+              display:true,
+              fieldId: "workorder_name",
+              formField:{
+                name:'工单名称',
+                type:'INPUT'
+              },
+              paramName:"name",
+              required:true,
+              value:''
+            },
+            {
+              display:true,
+              fieldId: "ef91e955bf894886b9edc56eb2c3755S333",
+              formField:{
+                extInfo:{
+                  isDelete:true,
+                  visibleWithoutPermission:false,
+                  maxNum:"3"
+                },
+                name:'单行输入框',
+                type:'INPUT'
+              },
+              paramName:"fieldValue.1adcfd3d0c494dcaba5c469ee8252e3f3333",
+              required:false,
+              value:''
+            },
+            {
+              display:true,
+              fieldId: "ef91e955bf894886b9edc56eb2c3755S444",
+              formField:{
+                extInfo:{
+                  isDelete:true,
+                  visibleWithoutPermission:false,
+                },
+                name:'多行输入框',
+                type:'TEXTAREA'
+              },
+              paramName:"fieldValue.1adcfd3d0c494dcaba5c469ee8252e3f3444",
+              required:false,
+              value:''
+            },
 
           ],
         },

package/src/components/formTemplate.vue

@@ -5,49 +5,176 @@
         {{formShow.form.name}}
       </div>
       <div class="pcFormClass" v-if="isCompany===true" style="width: 300px;margin: 0 auto;">
-      <div v-for="(item) in formShow.form.formFieldRelation" :key="item.formField.id"  :class="{notClick:disableds === true}">
-        <div v-if="item.formField.type==='INPUT'&& item.display===true" style="border-bottom: 1px solid #ebebeb">
-          <div style="display: flex;padding: 4px 0">
-            <div style="flex: 0.25;display:flex;align-items: center;height: 40px;text-align: left"><span style="color: red" v-if="item.required===true">*</span>{{item.formField.name}}</div>
-            <div style="flex: 0.75;display:flex;align-items: center;">
-              <el-input v-model=item.value  placeholder="请输入内容"></el-input>
+      <div v-for="(item) in formShow.form.formFieldRelation"
+           :key="item.formField.id"
+           :class="{notClick:disableds === true}"
+      >
+        <div v-if="item.formField.type!=='CHAT_RECORD'&&item.formField.type!=='CHANNEL'&&item.display&&item.fieldId!=='workorder_name'" class="field-item">
+          <div v-if="item.display&&item.fieldId!=='workorder_name'&&item.formField.type!=='EXPLANATION'&&item.formField.type!=='EXPLAIN'" class="field-item-name">
+            <span style="color: red" v-if="item.required===true">*</span>
+            <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>
+          </div>
+          <el-input v-model=item.value
+                    :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请输入'"
+                    :maxlength="item.formField.extInfo&&item.formField.extInfo.maxNum?item.formField.extInfo.maxNum*1:1000"
+                    v-if="item.formField.type==='INPUT'&&item.fieldId!=='workorder_name'"
+          ></el-input>
+          <div v-if="item.formField.type==='EXPLANATION'">
+            <div style="display: flex;padding: 4px 0">
+              <p style="color: #4C61E1;font-size: 14px;margin: 10px 4px">
+                <span class="el-icon-info"></span>
+                {{item.formField.extInfo.descriptionText}}
+              </p>
             </div>
           </div>
-        </div>
-        <div v-if="item.formField.type==='EXPLANATION'" style="border-bottom: 1px solid #ebebeb">
-          <div style="display: flex;padding: 4px 0">
-            <p style="color: #4C61E1;font-size: 14px;margin: 16px 4px">
-              <span class="el-icon-info"></span>
-              {{item.formField.extInfo.descriptionText}}
-            </p>
+          <div v-if="item.formField.type==='EXPLAIN'">
+            <div style="display: flex;padding: 4px 0">
+              <p style="color: #4C61E1;font-size: 14px;margin: 10px 4px">
+                <span class="el-icon-info"></span>
+                <span v-if="item.formField.extInfo.url" class="explain-url"><a :href="item.formField.extInfo.url" target="_blank">{{item.value}}</a></span>
+                <span v-else>{{item.value}}</span>
+              </p>
+            </div>
           </div>
-        </div>
-        <div v-if="item.formField.type==='EXPLAIN'" style="border-bottom: 1px solid #ebebeb">
-          <div style="display: flex;padding: 4px 0">
-            <p style="color: #4C61E1;font-size: 14px;margin: 16px 4px">
-              <span class="el-icon-info"></span>
-              <span v-if="item.formField.extInfo.url"><a :href="item.formField.extInfo.url" target="_blank">{{item.value}}</a></span>
-              <span>{{item.value}}</span>
-            </p>
+          <el-input type="textarea" :rows="2" v-model=item.value
+                    :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请输入'"
+                    :maxlength="item.formField.extInfo&&item.formField.extInfo.maxNum?item.formField.extInfo.maxNum*1:1000"
+                    v-if="item.formField.type==='TEXTAREA'&& item.display"
+          ></el-input>
+          <el-date-picker
+                  v-model=item.value
+                  type="date"
+                  :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择日期'"
+                  style="width: 100%"
+                  v-if="item.formField.type==='DATE_PICKER'"
+          >
+          </el-date-picker>
+          <el-time-picker
+                  v-model=item.value
+                  :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择时间'"
+                  style="width: 100%"
+                  v-if="item.formField.type==='TIME_PICKER' && !item.formField.extInfo.mold"
+          >
+          </el-time-picker>
+          <el-date-picker
+                  v-model=item.value
+                  type="date"
+                  style="width: 100%"
+                  :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择日期'"
+                  v-if="item.formField.type==='TIME_PICKER' &&item.formField.extInfo.mold==='DATA'"
+          >
+          </el-date-picker>
+          <el-date-picker
+                  v-model=item.value
+                  :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择日期时间'"
+                  clearable
+                  style="width: 100%"
+                  type="datetime"
+                  v-if="item.formField.type==='TIME_PICKER' &&item.formField.extInfo.mold==='DATA_TIME'"
+          >
+          </el-date-picker>
+          <div v-if="item.formField.type==='RADIO' &&item.formField.extInfo.options">
+            <el-radio-group v-model=item.value style="text-align:left">
+              <el-radio v-for="(items,index) in item.formField.extInfo.options" :label=items.value  :key="index">{{items.label}}</el-radio>
+            </el-radio-group>
           </div>
-        </div>
-        <!--<div v-if="item.formField.type==='CHAT_RECORD'"  style="border-bottom: 1px solid #ebebeb">
-          <div style="display: flex;padding: 4px 0;justify-content: center">
-            <p style="color: #4C61E1;font-size: 14px;margin: 16px 4px">
-              查看报单人与机器人聊天记录
-            </p>
+          <div v-if="item.formField.type==='RADIO' &&item.formField.extInfo.option">
+            <el-radio-group v-model=item.value style="text-align:left">
+              <el-radio v-for="(items,index) in item.formField.extInfo.option" :label=items.value  :key="index">{{items.label}}</el-radio>
+            </el-radio-group>
           </div>
-        </div>-->
-        <div v-if="item.formField.type==='TEXTAREA'&& item.display===true" style="border-bottom: 1px solid #ebebeb">
-          <div style="display: flex;padding: 4px 0">
-            <div style="flex: 0.25;display:flex;align-items: center;height: 40px;text-align: left"><span style="color: red" v-if="item.required===true">*</span>{{item.formField.name}}</div>
-            <div style="flex: 0.75;display:flex;align-items: center;">
-              <el-input type="textarea" :rows="2" v-model=item.value placeholder="请输入内容"></el-input>
+          <div v-if="item.formField.type==='CHECKBOX' && item.formField.extInfo.option">
+            <el-checkbox-group v-model=item.value style="text-align:left">
+              <el-checkbox
+                      v-for="(items,index) in item.formField.extInfo.option"
+                      :label=items.value
+                      :key="index"
+              >{{items.label}}</el-checkbox>
+            </el-checkbox-group>
+          </div>
+          <div v-if="item.formField.type==='CHECKBOX' && item.formField.extInfo.options">
+            <el-checkbox-group v-model=item.value style="text-align:left">
+              <el-checkbox
+                      v-for="(items,index) in item.formField.extInfo.options"
+                      :label=items.value
+                      :key="index"
+              >{{items.label}}</el-checkbox>
+            </el-checkbox-group>
+          </div>
+          <div v-if="item.formField.type==='SELECT'">
+            <el-select
+                    v-model=item.value
+                    :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择'"
+                    style="width: 100%"
+                    filterable
+                    v-if="item.formField.extInfo.option"
+            >
+              <el-option
+                      v-for="(items,index) in item.formField.extInfo.option"
+                      :key="index"
+                      :label="items.label"
+                      :value="items.value">
+              </el-option>
+            </el-select>
+            <el-select
+                    v-model=item.value
+                    :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择'"
+                    style="width: 100%"
+                    filterable
+                    v-else-if="item.formField.extInfo.options"
+            >
+              <el-option
+                      v-for="(items,index) in item.formField.extInfo.options"
+                      :key="index"
+                      :label="items.label"
+                      :value="items.value">
+              </el-option>
+            </el-select>
+          </div>
+          <div v-if="item.formField.type==='CASCADER'">
+            <el-cascader
+                    v-model=item.value
+                    :options=item.formField.extInfo.cascade
+                    style="width: 100%;"
+                    :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择时间'"
+                    v-if="item.formField.extInfo.cascade"
+            ></el-cascader>
+            <el-cascader
+                    v-model=item.value
+                    :options=item.formField.extInfo.cascadeDown[0].options
+                    style="width: 100%;"
+                    :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择时间'"
+                    v-else-if="item.formField.extInfo.cascadeDown"
+            ></el-cascader>
+          </div>
+          <div v-if="item.formField.type==='FILE'">
+            <div @click="checkUpload(item.fieldId,item.formField.extInfo.limitNum)" @mouseover="checkUpload(item.fieldId,item.formField.extInfo.limitNum)" style="flex: 0.75;display:flex;align-items: center;">
+              <el-upload
+                      class="upload-demo"
+                      ref="upload"
+                      list-type="picture-card"
+                      accept="image/*"
+                      name="file"
+                      action="/open/media/file/upload"
+                      :multiple="false"
+                      :file-list="fileListList[item.fieldId]"
+                      :limit=item.formField.extInfo.limitNum?Number(item.formField.extInfo.limitNum):1
+                      :before-upload="beforeAvatarUpload"
+                      :on-exceed="exceedUpload"
+                      :on-remove="handleRemove"
+                      :http-request="aliyunOssRequest"
+                      :on-change="handleEditChange"
+                      :on-success="successUpload"
+              >
+                <i  class="el-icon-plus"></i>
+              </el-upload>
             </div>
-
           </div>
         </div>
-        <div v-if="item.formField.type==='DATE_PICKER'&& item.display===true" style="border-bottom: 1px solid #ebebeb">
+
+      <!--  <div v-if="item.formField.type==='DATE_PICKER'&& item.display===true" style="border-bottom: 1px solid #ebebeb">
 
           <div style="display: flex;padding: 4px 0">
             <div style="flex: 0.25;display:flex;align-items: center;height: 40px;text-align: left"><span style="color: red" v-if="item.required===true">*</span>{{item.formField.name}}</div>
@@ -55,7 +182,7 @@
               <el-date-picker
                   v-model=item.value
                   type="date"
-                  placeholder="选择日期"
+                  :placeholder="item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择日期'"
                   style="width: 100%"
               >
               </el-date-picker>
@@ -69,7 +196,7 @@
             <div style="flex: 0.75;display:flex;align-items: center;" v-if="!item.formField.extInfo.mold">
               <el-time-picker
                   v-model=item.value
-                  placeholder="选择时间"
+                  :placeholder="item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择时间'"
                   style="width: 100%"
               >
               </el-time-picker>
@@ -78,14 +205,14 @@
               <el-date-picker
                       v-model=item.value
                       type="date"
-                      placeholder="请选择日期"
+                      :placeholder="item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择日期'"
               >
               </el-date-picker>
             </div>
             <div style="flex: 0.75;display:flex;align-items: center;" v-if="item.formField.extInfo.mold==='DATA_TIME'">
               <el-date-picker
                       v-model=item.value
-                      placeholder="请选择日期时间"
+                      :placeholder="item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择日期时间'"
                       clearable
                       type="datetime"
               >
@@ -140,7 +267,7 @@
             <div style="flex: 0.75;display:flex;align-items: center;" v-if="item.formField.extInfo.option">
               <el-select
                   v-model=item.value
-                  placeholder="请选择"
+                  :placeholder="item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择'"
                   style="width: 100%"
                   filterable
               >
@@ -155,7 +282,7 @@
             <div style="flex: 0.75;display:flex;align-items: center;" v-if="item.formField.extInfo.options">
               <el-select
                       v-model=item.value
-                      placeholder="请选择"
+                      :placeholder="item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择时间'"
                       style="width: 100%"
                       filterable
               >
@@ -173,11 +300,20 @@
         <div v-if="item.formField.type==='CASCADER' && item.display===true" style="border-bottom: 1px solid #ebebeb">
           <div style="display: flex;padding: 4px 0">
             <div style="flex: 0.25 ;display:flex;align-items: center;height: 40px;text-align: left"><span style="color: red" v-if="item.required===true">*</span>{{item.formField.name}}</div>
+            <div style="flex: 0.75;display:flex;align-items: center;" v-if="item.formField.extInfo.cascade">
+              <el-cascader
+                      v-model=item.value
+                      :options=item.formField.extInfo.cascade
+                      style="width: 100%;"
+                      :placeholder="item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择时间'"
+              ></el-cascader>
+            </div>
             <div style="flex: 0.75;display:flex;align-items: center;" v-if="item.formField.extInfo.cascadeDown">
               <el-cascader
                       v-model=item.value
                       :options=item.formField.extInfo.cascadeDown[0].options
                       style="width: 100%;"
+                      :placeholder="item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择时间'"
               ></el-cascader>
             </div>
           </div>
@@ -208,7 +344,7 @@
             </div>
 
           </div>
-        </div>
+        </div>-->
       </div>
       <div style="padding: 10px 0;text-align: center">
         <el-button style="border-color: #4C61E1;color: white;background-color: #4C61E1"  round class="submitClass" size="small" @click="submitClick" :disabled="disableds">{{submitValue}}</el-button>
@@ -217,8 +353,14 @@
     </div>
     <div class="mobileFormClass" v-if="isPhone===true" style="padding: 10px 0;" :class="{notClick:disableds === true}">
       <div v-for="(item,index) in formShow.form.formFieldRelation" :key="item.formField.id" >
-        <div v-if="item.formField.type==='INPUT'&&item.display === true" style="border-bottom: 1px solid #ebebeb">
-          <van-field v-model=item.value :label=item.formField.name :required="item.required===true" :disabled="disableds"  placeholder="请输入内容"/>
+        <div v-if="item.formField.type==='INPUT'&&item.display === true&&item.fieldId!=='workorder_name'" style="border-bottom: 1px solid #ebebeb">
+          <van-field v-model=item.value
+                     :label=item.formField.name
+                     :required="item.required===true"
+                     :disabled="disableds"
+                     :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请输入'"
+                     :maxlength="item.formField.extInfo&&item.formField.extInfo.maxNum?item.formField.extInfo.maxNum*1:1000"
+          />
         </div>
         <div v-if="item.formField.type==='EXPLANATION'" style="border-bottom: 1px solid #ebebeb">
           <div style="display: flex;padding: 4px 0">
@@ -232,21 +374,31 @@
           <div style="display: flex;padding: 4px 0">
             <p style="color: #4C61E1;font-size: 14px;margin: 16px 4px">
               <span class="el-icon-info"></span>
-              {{item.value}}
+              <span v-if="item.formField.extInfo.url" class="explain-url"><a :href="item.formField.extInfo.url" target="_blank">{{item.value}}</a></span>
+              <span v-else>{{item.value}}</span>
             </p>
           </div>
         </div>
-       <!-- <div v-if="item.formField.type==='CHAT_RECORD'" style="border-bottom: 1px solid #ebebeb">
-          <div style="display: flex;padding: 4px 0;align-items: center;justify-content: center">
-            <p style="color: #4C61E1;font-size: 14px;margin: 16px 4px">
-              查看报单人与机器人聊天记录
-            </p>
-          </div>
-        </div>-->
         <div v-if="item.formField.type==='TEXTAREA'&&item.display === true" style="border-bottom: 1px solid #ebebeb">
-          <van-field v-model=item.value :label=item.formField.name :required="item.required===true" type="textarea" :disabled="disableds" placeholder="请输入内容"/>
+          <van-field v-model=item.value
+                     :label=item.formField.name
+                     :required="item.required===true"
+                     type="textarea"
+                     :disabled="disableds"
+                     :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请输入'"
+                     :maxlength="item.formField.extInfo&&item.formField.extInfo.maxNum?item.formField.extInfo.maxNum*1:1000"
+                     v-if="item.fieldId!=='workorder_description'"
+          />
+          <van-field v-model=item.value
+                     label='问题描述'
+                     :required="item.required===true"
+                     type="textarea"
+                     :disabled="disableds"
+                     :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请输入'"
+                     :maxlength="item.formField.extInfo&&item.formField.extInfo.maxNum?item.formField.extInfo.maxNum*1:1000"
+                     v-if="item.fieldId==='workorder_description'"
+          />
         </div>
-
         <div v-if="item.formField.type==='DATE_PICKER'&&item.display === true" style="display: flex;border-bottom: 1px solid #ebebeb">
 
           <van-field
@@ -255,7 +407,7 @@
               name="calendar"
               :value=dateValue[item.fieldId]
               :label=item.formField.name
-              placeholder="点击选择日期"
+              :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择日期'"
               :required="item.required===true"
               @click="dateClick(item.fieldId)"
               :disabled="disableds"
@@ -281,7 +433,7 @@
               :required="item.required===true"
               :value=timeValue[item.fieldId]
               :label=item.formField.name
-              placeholder="点击选择时间"
+              :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择时间'"
               @click="timeClick(item.fieldId,item)"
               :disabled="disableds"
 
@@ -306,7 +458,7 @@
                   :required="item.required===true"
                   :value=timeValue[item.fieldId]
                   :label=item.formField.name
-                  placeholder="点击选择日期"
+                  :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择日期'"
                   @click="timeClick(item.fieldId,item)"
                   :disabled="disableds"
 
@@ -415,19 +567,30 @@
           </van-field>
         </div>
         <div v-if="item.formField.type==='SELECT'&&item.display === true" style="display: flex;border-bottom: 1px solid #ebebeb">
-
           <van-field
               readonly
               clickable
               name="picker"
               :value=selectValues[item.fieldId]
               :label=item.formField.name
-              placeholder="点击选择"
+              :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择'"
               @click="selectClick(item.fieldId)"
               :required="item.required===true"
               :disabled="disableds"
+              v-if="item.fieldId!=='workorder_clientId'"
+          />
+          <van-field
+                  readonly
+                  clickable
+                  name="picker"
+                  :value=selectValues[item.fieldId]
+                  label='报单人'
+                  :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择'"
+                  @click="selectClick(item.fieldId)"
+                  :required="item.required===true"
+                  :disabled="disableds"
+                  v-if="item.fieldId==='workorder_clientId'"
           />
-
           <van-popup v-model="showPicker" position="bottom">
             <van-picker
                 show-toolbar
@@ -455,7 +618,7 @@
               name="area"
               :value=cascadeValue[item.fieldId]
               :label=item.formField.name
-              placeholder="点击选择"
+              :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择'"
               @click="pickerClick(item.fieldId)"
               :required="item.required===true"
               :disabled="disableds"
@@ -810,19 +973,8 @@ export default {
     },
     //初始化默认值
     defaultClick() {
-      console.log(this.formList.form)
       for (let i = 0; i < this.formList.form.formFieldRelation.length; i++)
       {
-        if(this.formList.form.formFieldRelation[i].formField.type ==='CASCADER')
-        {
-          if(!this.formList.form.formFieldRelation[i].formField.extInfo.cascade)
-          {
-            if(this.formList.form.formFieldRelation[i].formField.extInfo.cascadeDown)
-            {
-              this.$set(this.formList.form.formFieldRelation[i].formField.extInfo,'cascade',this.formList.form.formFieldRelation[i].formField.extInfo.cascadeDown[0].options)
-            }
-          }
-        }
         if(this.formList.form.formFieldRelation[i].formField.type ==='SELECT'||this.formList.form.formFieldRelation[i].formField.type ==='CHECKBOX' ||this.formList.form.formFieldRelation[i].formField.type==='RADIO')
         {
           if(!this.formList.form.formFieldRelation[i].formField.extInfo.option)
@@ -838,12 +990,12 @@ export default {
             if (this.formList.form.formFieldRelation[i].formField.extInfo.option){
               if (this.formList.form.formFieldRelation[i].formField.type === 'RADIO') {
                 for (let j = 0; j < this.formList.form.formFieldRelation[i].formField.extInfo.option.length; j++) {
-                  if(this.formList.form.formFieldRelation[i].formField.extInfo.option[j].value==='')
+                  if(!this.formList.form.formFieldRelation[i].formField.extInfo.option[j].value)
                   {
                     this.formList.form.formFieldRelation[i].formField.extInfo.option[j].value=this.formList.form.formFieldRelation[i].formField.extInfo.option[j].label
                   }
                 }
-                if(this.formList.form.formFieldRelation[i].value === null||this.formList.form.formFieldRelation[i].value==='')
+                if(!this.formList.form.formFieldRelation[i].value)
                 {
                   for (let j = 0; j < this.formList.form.formFieldRelation[i].formField.extInfo.option.length; j++) {
                     if (this.formList.form.formFieldRelation[i].formField.extInfo.option[j]._default === 'true') {
@@ -854,12 +1006,12 @@ export default {
               }
               if (this.formList.form.formFieldRelation[i].formField.type === 'CHECKBOX') {
                 for (let j = 0; j < this.formList.form.formFieldRelation[i].formField.extInfo.option.length; j++) {
-                  if (this.formList.form.formFieldRelation[i].formField.extInfo.option[j].value === '') {
+                  if (!this.formList.form.formFieldRelation[i].formField.extInfo.option[j].value) {
                     this.formList.form.formFieldRelation[i].formField.extInfo.option[j].value = this.formList.form.formFieldRelation[i].formField.extInfo.option[j].label
                   }
                 }
 
-                if (this.formList.form.formFieldRelation[i].value === null||this.formList.form.formFieldRelation[i].value.length === 0)
+                if (!this.formList.form.formFieldRelation[i].value||this.formList.form.formFieldRelation[i].value.length === 0)
                 {
                   this.formList.form.formFieldRelation[i].value=[]
                   for (let j = 0; j < this.formList.form.formFieldRelation[i].formField.extInfo.option.length; j++) {
@@ -956,12 +1108,12 @@ export default {
           test.push(this.formList.form.formFieldRelation[i])
           let cascader=''
           console.log(this.formList.form.formFieldRelation[i])
-          if(this.formList.form.formFieldRelation[i].value!==null)
+          if(this.formList.form.formFieldRelation[i].value)
           {
             if(this.formList.form.formFieldRelation[i].value.length > 0)
             {
               for (let j = 0; j < this.formList.form.formFieldRelation[i].value.length; j++) {
-                if (this.formList.form.formFieldRelation[i].value[j] !== undefined) {
+                if (this.formList.form.formFieldRelation[i].value[j]) {
                   cascader += this.formList.form.formFieldRelation[i].value[j] + '/'
                 }
               }
@@ -993,14 +1145,13 @@ export default {
           }
         }
         if (this.formList.form.formFieldRelation[i].formField.type === 'SELECT') {
-          console.log(this.formList.form.formFieldRelation[i].formField.extInfo)
-        /*  if ( this.formList.form.formFieldRelation[i].formField.extInfo.option){
+          if ( this.formList.form.formFieldRelation[i].formField.extInfo.option){
             for (let j = 0; j < this.formList.form.formFieldRelation[i].formField.extInfo.option.length; j++) {
               if (this.formList.form.formFieldRelation[i].formField.extInfo.option[j].value === '') {
                 this.formList.form.formFieldRelation[i].formField.extInfo.option[j].value = this.formList.form.formFieldRelation[i].formField.extInfo.option[j].label
               }
             }
-            if(this.formList.form.formFieldRelation[i].value !==null && this.formList.form.formFieldRelation[i].value!=='')
+            if(this.formList.form.formFieldRelation[i].value)
             {
               console.log(this.formList.form.formFieldRelation[i].formField.extInfo.option)
               for (let j=0;j<this.formList.form.formFieldRelation[i].formField.extInfo.option.length;j++)
@@ -1010,7 +1161,7 @@ export default {
                   this.selectValues[this.formList.form.formFieldRelation[i].fieldId] =this.formList.form.formFieldRelation[i].formField.extInfo.option[j].label
                 }
               }
-              /!*this.selectValues[this.formList.form.formFieldRelation[i].fieldId] = this.formList.form.formFieldRelation[i].value*!/
+              /*this.selectValues[this.formList.form.formFieldRelation[i].fieldId] = this.formList.form.formFieldRelation[i].value*/
 
             }
             else
@@ -1029,7 +1180,7 @@ export default {
                 this.formList.form.formFieldRelation[i].formField.extInfo.options[j].value = this.formList.form.formFieldRelation[i].formField.extInfo.options[j].label
               }
             }
-            if(this.formList.form.formFieldRelation[i].value !==null && this.formList.form.formFieldRelation[i].value!=='')
+            if(this.formList.form.formFieldRelation[i].value)
             {
               for (let j=0;j<this.formList.form.formFieldRelation[i].formField.extInfo.options.length;j++)
               {
@@ -1038,7 +1189,7 @@ export default {
                   this.selectValues[this.formList.form.formFieldRelation[i].fieldId] =this.formList.form.formFieldRelation[i].formField.extInfo.options[j].label
                 }
               }
-              /!*this.selectValues[this.formList.form.formFieldRelation[i].fieldId] = this.formList.form.formFieldRelation[i].value*!/
+              /*this.selectValues[this.formList.form.formFieldRelation[i].fieldId] = this.formList.form.formFieldRelation[i].value*/
 
             }
             else
@@ -1050,7 +1201,7 @@ export default {
                 }
               }
             }
-          }*/
+          }
 
         }
       }
@@ -1189,14 +1340,15 @@ export default {
       {
         if(this.formShow.form.formFieldRelation[i].formField.type==='CASCADER')
         {
-          this.formShow.form.formFieldRelation[i].formField.extInfo.cascade.forEach(item=>{
+          let cascader = this.formShow.form.formFieldRelation[i].formField.extInfo.cascade?this.formShow.form.formFieldRelation[i].formField.extInfo.cascade:this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown[0].options?this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown[0].options:[]
+          cascader.forEach(item=>{
             if(item.children!==undefined)
             {
               if(item.children.length===0)
                 delete item.children
               else {
                 item.children.forEach(items=>{
-                  if(items.children!==undefined)
+                  if(items.children)
                   {
                     if(items.children.length===0)
                       delete items.children
@@ -1205,6 +1357,7 @@ export default {
               }
             }
           })
+
           let test=[]
           console.log(typeof test)
         }
@@ -1221,7 +1374,7 @@ export default {
           this.formShow.form.formFieldRelation[i].value=value
         }
 
-        if(this.formShow.form.formFieldRelation[i].display===true && this.formShow.form.formFieldRelation[i].required === true)
+        if(this.formShow.form.formFieldRelation[i].display===true && this.formShow.form.formFieldRelation[i].required === true&&this.formShow.form.formFieldRelation[i].fieldId!=='workorder_name')
         {
 
             if(!this.formShow.form.formFieldRelation[i].value || (this.formShow.form.formFieldRelation[i].value&&this.formShow.form.formFieldRelation[i].value.length===0))
@@ -1686,17 +1839,30 @@ export default {
 }
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
 .notClick {
   pointer-events: none;
 }
+.formClass{
+  .explain-url{
+    a{
+      color:#4C61E1 ;
+    }
+  }
+}
 .mobileFormClass,.pcFormClass{
   /* border: 1px solid #ebebeb;*/
   font-family: "Avenir", Helvetica, Arial, sans-serif;
   border-radius: 15px;
 }
 .pcFormClass{
-  .el-upload--picture-card{
+  .field-item{
+    padding: 8px 0;
+    .field-item-name{
+      padding-bottom: 4px;
+    }
+  }
+  /deep/.el-upload--picture-card{
     background-color: #fbfdff;
     border: 1px dashed #c0ccda;
     border-radius: 6px;
@@ -1712,28 +1878,28 @@ export default {
     justify-content: center;
   }
 
-  .el-upload-list--picture-card{
+  /deep/.el-upload-list--picture-card{
     .el-upload-list__item{
       width: 74px;
       height: 74px;
     }
   }
-  .el-upload-list__item-name{
+  /deep/.el-upload-list__item-name{
     max-width: 180px;
   }
   .hide .el-upload--picture-card {
     display: none!important;
   }
 }
-.van-radio__icon--checked .van-icon{
+/deep/.van-radio__icon--checked .van-icon{
   background-color: #4C61E1!important;
   border-color: #4C61E1!important;
 }
-.van-checkbox__icon--checked .van-icon{
+/deep/.van-checkbox__icon--checked .van-icon{
   background-color: #4C61E1!important;
   border-color: #4C61E1!important;
 }
-.vant-upload--picture-card{
+/deep/.vant-upload--picture-card{
   background-color: #fbfdff;
   border: 1px dashed #c0ccda;
   border-radius: 6px;
@@ -1748,7 +1914,7 @@ export default {
   align-items: center;
   justify-content: center;
 }
-.van-popup{
+/deep/.van-popup{
   border-radius: 5px;
 }
 .remPhoneClassForm{
@@ -1764,7 +1930,7 @@ export default {
   }
   .mobileFormClass{
     .upload-phone-demo{
-      .el-upload--picture-card{
+      /deep/.el-upload--picture-card{
         background-color: #fbfdff;
         border: 1px dashed #c0ccda;
         border-radius: 6px;
@@ -1779,7 +1945,7 @@ export default {
         align-items: center;
         justify-content: center;
       }
-      .el-upload-list--picture-card .el-upload-list__item{
+      /deep/.el-upload-list--picture-card .el-upload-list__item{
         height: 76px;
         width: 76px;
       }
@@ -1793,10 +1959,10 @@ export default {
     color: white!important;
     height: 36px;
   }
-  .van-button--info{
+  /deep/.van-button--info{
     border:1px solid #4C61E1;
   }
-  .van-field__label{
+  /deep/.van-field__label{
     width: 5em!important;
     text-align: left;
     color: #000000!important;
@@ -1805,26 +1971,26 @@ export default {
     line-height: 2;
   }
 
-  .van-field__control{
+  /deep/.van-field__control{
     min-height: 36px;
     border-radius: 5px;
   }
-  .van-checkbox--horizontal{
+  /deep/.van-checkbox--horizontal{
     padding: 0.2rem 0;
   }
-  .van-radio--horizontal{
+  /deep/.van-radio--horizontal{
     padding: 0.2rem 0;
   }
-  .van-dropdown-menu__bar{
+  /deep/.van-dropdown-menu__bar{
     box-shadow: none!important;
   }
 
-  .van-overlay{
-    background-color: rgba(0,0,0,.7);
+  /deep/.van-overlay{
+    background-color: rgba(0,0,0,.5);
   }
 
 
-  .el-input__inner{
+  /deep/.el-input__inner{
     background-color: transparent!important;
   }
 
@@ -1854,18 +2020,18 @@ export default {
     text-align: center;
     padding: 8px 0;
   }
-  .el-radio__input.is-checked+.el-radio__label{
+  /deep/.el-radio__input.is-checked+.el-radio__label{
     color: #4C61E1!important;
   }
-  .el-radio__input.is-checked .el-radio__inner{
+  /deep/.el-radio__input.is-checked .el-radio__inner{
     color: #4C61E1!important;
     border-color:  #4C61E1!important;
     background: #4C61E1!important;
   }
-  .el-checkbox__input.is-checked+.el-checkbox__label{
+  /deep/.el-checkbox__input.is-checked+.el-checkbox__label{
     color: #4C61E1!important;
   }
-  .el-checkbox__input.is-checked .el-checkbox__inner, .el-checkbox__input.is-indeterminate .el-checkbox__inner{
+  /deep/.el-checkbox__input.is-checked .el-checkbox__inner, .el-checkbox__input.is-indeterminate .el-checkbox__inner{
     background-color: #4C61E1!important;
     border-color: #4C61E1!important;
   }