完善履历

src/api/project/project.js

@@ -134,14 +134,28 @@ export function exportSbType (parameter) {
  */
 export function fetchSbTypeTree (parameter) {
   return axios({
-    url: '/project/tree?' + stringify(parameter),
+    url: '/project?' + stringify(parameter),
     method: 'get',
     headers: {
       'Content-Type': 'application/json;charset=UTF-8'
     }
   })
 }
-
+// /**
+//  * page func
+//  * parameter: { }
+//  * @param parameter
+//  * @returns {*}
+//  */
+// export function fetchSbTypeTree (parameter) {
+//   return axios({
+//     url: '/project/tree?' + stringify(parameter),
+//     method: 'get',
+//     headers: {
+//       'Content-Type': 'application/json;charset=UTF-8'
+//     }
+//   })
+// }
 export function fetchStoreTypeTree (parameter) {
   return axios({
     url: '/report/stores/tree?' + stringify(parameter),
@@ -166,4 +180,4 @@ export function fetchSbTypeTableTree (parameter) {
       'Content-Type': 'application/json;charset=UTF-8'
     }
   })
-}
+}

src/views/project/modules/BaseForm.vue

@@ -96,10 +96,10 @@
       >
         <a-select v-decorator="['parentId', {rules: [{required: isShowParent, message: '上层项目类型不能为空'}]}]" placeholder="请选择">
           <a-select-option
-            v-for="{value,title} in treeData"
-            :key="value"
-            :label="title"
-            :value="value">{{ title }}
+            v-for="{name,id} in treeData"
+            :key="id"
+            :label="name"
+            :value="id">{{ name }}
           </a-select-option>
         </a-select>
       </a-form-item>

src/views/repair/application-form/modules/TicketForm.vue

@@ -307,7 +307,8 @@
           </tr>
           <tr>
             <td colspan="29">
-              <div style="flex:1">安全交底：</div>
+              <div style="flex:1">工作开始时间:&nbsp;{{ BaseTool.Date.formatter(new Date(), BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
+              }}&nbsp;&nbsp;安全交底：</div>
             </td>
           </tr>
           <tr>
@@ -404,8 +405,6 @@
             </td>
           </tr>
         </table>
-        <div style="position:absolute;bottom: -20px;right:0">打印日期：{{ BaseTool.Date.formatter(new Date(), BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
-        }}</div>
       </div>
 
     </div>

src/views/store/outstoreform/modules/BaseFormYY.vue

@@ -178,14 +178,14 @@
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-tree-select
-              style="width: 100%"
-              :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
-              :treeData="treeData"
-              v-decorator="['projectId']"
-              placeholder="请选择"
-            >
-            </a-tree-select>
+            <a-select v-decorator="['projectId', {rules: [{required: true, message: '项目不能为空'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="{name,id} in treeData"
+                :key="id"
+                :label="name"
+                :value="id">{{ name }}
+              </a-select-option>
+            </a-select>
           </a-form-item>
 
           <a-form-item
@@ -467,12 +467,10 @@ export default {
     },
     setTree () {
       fetchSbTypeTree({
-        flag: this.tokenType
+        flag: this.tokenType,
+        type: 2
       }).then((res) => {
-        this.treeData = res.data.map(item => {
-          item.selectable = item.children == null
-          return item
-        })
+        this.treeData = res.data
       })
     },
     save () {