Merge pull request #29 from lanyulei/dev

fix bug.

src/components/VueFormMaking/components/Container.vue

@@ -109,7 +109,15 @@
           form
           form
           @on-close="previewVisible = false"
           @on-close="previewVisible = false"
         >
         >
-          <generate-form v-if="previewVisible" ref="generateForm" insite="true" :data="widgetForm" :value="widgetModels" :remote="remoteFuncs" @on-change="handleDataChange">
+          <generate-form
+            v-if="previewVisible"
+            ref="generateForm"
+            insite="true"
+            :data="widgetForm"
+            :value="widgetModels"
+            :remote="remoteFuncs"
+            @on-change="handleDataChange"
+          >
 
 
             <template slot-scope="scope">
             <template slot-scope="scope">
               Width <el-input v-model="scope.model.blank.width" style="width: 100px" />
               Width <el-input v-model="scope.model.blank.width" style="width: 100px" />

src/components/VueFormMaking/components/GenerateForm.vue

@@ -164,7 +164,6 @@ export default {
           })
           })
         } else if (genList[i].type === 'subform') {
         } else if (genList[i].type === 'subform') {
           // this.generateModle(genList[i].columns.list)
           // this.generateModle(genList[i].columns.list)
-          console.log(genList[i].columns)
         } else {
         } else {
           if (this.value && Object.keys(this.value).indexOf(genList[i].model) >= 0) {
           if (this.value && Object.keys(this.value).indexOf(genList[i].model) >= 0) {
             this.models[genList[i].model] = this.value[genList[i].model]
             this.models[genList[i].model] = this.value[genList[i].model]

src/components/VueFormMaking/components/GenerateFormItem.vue

@@ -63,7 +63,9 @@
     <template v-else>
     <template v-else>
       <template v-if="widget.type === 'input'">
       <template v-if="widget.type === 'input'">
         <el-input
         <el-input
-          v-if="widget.options.dataType === 'number' || widget.options.dataType === 'integer' || widget.options.dataType === 'float'"
+          v-if="widget.options.dataType === 'number'
+            || widget.options.dataType === 'integer'
+            || widget.options.dataType === 'float'"
           v-model.number="dataModel"
           v-model.number="dataModel"
           :type="widget.options.dataType"
           :type="widget.options.dataType"
           :placeholder="widget.options.placeholder"
           :placeholder="widget.options.placeholder"

src/components/VueFormMaking/components/WidgetConfig.vue

@@ -396,7 +396,6 @@
           <el-checkbox v-if="Object.keys(data.options).indexOf('arrowControl')>=0" v-model="data.options.arrowControl">{{ $t('fm.config.widget.arrowControl') }}</el-checkbox>
           <el-checkbox v-if="Object.keys(data.options).indexOf('arrowControl')>=0" v-model="data.options.arrowControl">{{ $t('fm.config.widget.arrowControl') }}</el-checkbox>
           <el-checkbox v-if="Object.keys(data.options).indexOf('isDelete')>=0" v-model="data.options.isDelete">{{ $t('fm.config.widget.isDelete') }}</el-checkbox>
           <el-checkbox v-if="Object.keys(data.options).indexOf('isDelete')>=0" v-model="data.options.isDelete">{{ $t('fm.config.widget.isDelete') }}</el-checkbox>
           <el-checkbox v-if="Object.keys(data.options).indexOf('isEdit')>=0" v-model="data.options.isEdit">{{ $t('fm.config.widget.isEdit') }}</el-checkbox>
           <el-checkbox v-if="Object.keys(data.options).indexOf('isEdit')>=0" v-model="data.options.isEdit">{{ $t('fm.config.widget.isEdit') }}</el-checkbox>
-
         </el-form-item>
         </el-form-item>
         <el-form-item :label="$t('fm.config.widget.validate')">
         <el-form-item :label="$t('fm.config.widget.validate')">
           <div v-if="Object.keys(data.options).indexOf('required')>=0">
           <div v-if="Object.keys(data.options).indexOf('required')>=0">

src/views/process/list/apply-process-list.vue

@@ -19,11 +19,18 @@
 
 
       <div v-for="item in processLists" :key="item.id">
       <div v-for="item in processLists" :key="item.id">
         <div v-if="item.process_list.length!==0">
         <div v-if="item.process_list.length!==0">
-          <div class="workflow-classify-title">{{ item.name }}</div>
+          <div class="workflow-classify-title">
+            {{ item.name }}
+          </div>
           <div style="margin-bottom: 15px;">
           <div style="margin-bottom: 15px;">
+            <template v-for="buttonItem in item.process_list">
+              <el-tooltip :key="buttonItem.id" effect="dark" placement="top">
+                <div slot="content">
+                  {{ buttonItem.name }}
+                  <br>
+                  {{ buttonItem.remarks }}
+                </div>
                 <el-button
                 <el-button
-              v-for="buttonItem in item.process_list"
-              :key="buttonItem.id"
                   class="workflow-classify-button"
                   class="workflow-classify-button"
                   plain
                   plain
                   @click="submitWorkOrder(buttonItem.id)"
                   @click="submitWorkOrder(buttonItem.id)"
@@ -42,6 +49,8 @@
                     </div>
                     </div>
                   </div>
                   </div>
                 </el-button>
                 </el-button>
+              </el-tooltip>
+            </template>
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>
@@ -81,8 +90,8 @@ export default {
 
 
 <style scoped>
 <style scoped>
   .workflow-classify-title {
   .workflow-classify-title {
-    border-bottom: 1px solid #dddddd;
-    padding-bottom: 5px;
+    border-left: 3px solid rgb(64, 158, 255);
+    padding-left: 5px;
   }
   }
 
 
   .workflow-classify-button {
   .workflow-classify-button {

src/views/process/list/create.vue

@@ -52,7 +52,7 @@
             :data="tplItem.form_structure"
             :data="tplItem.form_structure"
             :disabled="currentNode.readonlyTpls===undefined ||
             :disabled="currentNode.readonlyTpls===undefined ||
               currentNode.readonlyTpls===null ||
               currentNode.readonlyTpls===null ||
-              currentNode.readonlyTpls.indexOf(tplItem.id)===-1?false:true"
+              currentNode.readonlyTpls.indexOf(tplItem.id)===-1?null:true"
           />
           />
         </template>
         </template>
       </div>
       </div>