Merge remote-tracking branch 'origin/demo_' into demo_

src/utils/dict.js

@@ -322,6 +322,9 @@ DictCache.TYPE = {
   CUSTOM_FIELD_TEMPLATE_FILED_TYPE: 'CUSTOM_FIELD_TEMPLATE_FILED_TYPE',
   PARAMETER_TYPE: 'PARAMETER_TYPE',
   REPAIR_HOLIDAY: 'REPAIR_HOLIDAY', // 节假日列表
+  // 筹建
+
+  PREPARATION_PARENT: 'PREPARATION_PARENT',
   // 隐患管理
   PROFESSOR_TYPE: 'PROFESSOR_TYPE',
   CHECK_LEVEL: 'CHECK_LEVEL',

src/views/preparation/preparation/Preparation.vue

@@ -58,7 +58,7 @@
         <span slot="action" slot-scope="record">
           <template>
             <a @click="handleView(record)">主页数据</a>
-<!--            <operation-button
+            <!--            <operation-button
               v-if="$auth('preparation-preparations-edit')"
               @click="handleEdit(record)"
             >修改</operation-button>-->
@@ -157,10 +157,11 @@ export default {
         {
           title: '报修状态',
           checked: true,
-          width: '100',
-          fixed: 'right',
           dataIndex: 'status',
-          scopedSlots: { customRender: 'status' }
+          width: 150,
+          customRender: (text, record, index) => {
+            return this.BaseTool.Object.getField(this.statusMap, text)
+          }
         },
         {
           title: '操作',
@@ -250,7 +251,6 @@ export default {
       })
     },
     handleAdd () {
-      this.visible = false
       const modal = this.$refs.baseModal
       modal.base()
     },
@@ -286,7 +286,7 @@ export default {
         ...this.queryParam
       }
       exportPreparation(parameter).then(file => {
-        this.BaseTool.Util.downLoadExportExcel(file)
+        this.BaseTool.UPLOAD.downLoadExportExcel(file)
       })
     },
     handleEnter () {

src/views/preparation/preparation/modules/BaseForm.vue

@@ -14,19 +14,36 @@
       </a-form-item>
 
       <row-list :col="2">
+        <row-item>
+          <a-form-item
+            label="公司"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-select v-decorator="['parentPositionId', {rules: [{required: true, message: '公司不能为空'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="(label,value) in preparationMap"
+                :key="value"
+                :label="label"
+                :value="value">{{ label }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </row-item>
         <row-item>
           <a-form-item
             label="建筑物"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-cascader
-              :options="sbPositionList"
-              :load-data="loadData"
-              placeholder="请选择"
-              change-on-select
-              v-decorator="['positionId', {rules: [{required: true, message: '建筑物不能为空'}]}]"
-            />
+            <a-select v-decorator="['positionId', {rules: [{required: true, message: '建筑物不能为空'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="item in sbPositionList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id">{{ item.name }}
+              </a-select-option>
+            </a-select>
           </a-form-item>
         </row-item>
         <row-item>
@@ -67,7 +84,7 @@
           </a-form-item>
         </row-item>
       </row-list>
-        <row-list :col="1">
+      <row-list :col="1">
         <row-item>
           <a-form-item
             label="问题描述"
@@ -79,7 +96,7 @@
               v-decorator="['content', {rules: [{required: true, message: '委托内容描述不能为空'}]}]"/>
           </a-form-item>
         </row-item>
-<!--        <row-item>
+        <!--        <row-item>
 
           <a-form-item
             label="报修状态"
@@ -88,7 +105,7 @@
           >
           </a-form-item>
         </row-item>-->
-<!--        <row-item>
+        <!--        <row-item>
 
           <a-form-item
             label="维修开始时间"
@@ -131,7 +148,7 @@
               v-decorator="['repairMinutes', {rules: [{required: true, message: '维修耗时不能为空'}]}]" />
           </a-form-item>
         </row-item>-->
-<!--        <row-item>
+        <!--        <row-item>
 
           <a-form-item
             label="维修人员id"
@@ -142,7 +159,7 @@
               v-decorator="['repairUserId', {rules: [{required: true, message: '维修人员id不能为空'}]}]" />
           </a-form-item>
         </row-item>-->
-<!--        <row-item>
+        <!--        <row-item>
 
           <a-form-item
             label="维修描述"
@@ -153,7 +170,7 @@
               v-decorator="['repairContent', {rules: [{required: true, message: '维修描述不能为空'}]}]" />
           </a-form-item>
         </row-item>-->
-<!--        <row-item>
+        <!--        <row-item>
 
           <a-form-item
             label="费用预算"
@@ -168,7 +185,7 @@
               v-decorator="['fee', {rules: [{required: true, message: '费用预算不能为空'}]}]" />
           </a-form-item>
         </row-item>-->
-<!--        <row-item>
+        <!--        <row-item>
 
           <a-form-item
             label="预算明细表"
@@ -208,6 +225,7 @@ export default {
   created () {
     // 下拉框map
     this.getSbPositions()
+    this.preparationMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.PREPARATION_PARENT)
   },
   methods: {
     base (record) {
@@ -248,15 +266,7 @@ export default {
     getSbPositions (parentId) {
       getSbPositions({ parentId }).then(res => {
         console.log(res)
-        this.sbPositionList = res.data.map(item => {
-          item = {
-            label: item.name,
-            value: item.name,
-            id: item.id,
-            isLeaf: false
-          }
-          return item
-        })
+        this.sbPositionList = res.data
       })
     },
     loadData (selectedOptions) {
@@ -286,7 +296,7 @@ export default {
         // 日期处理
         values.applyTime = this.BaseTool.Date.formatter(values.applyTime, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
         values.limitHours = this.BaseTool.Date.formatter(values.limitHours, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
-        values.positionId = values.positionId[1]
+
         if (this.BaseTool.String.isBlank(values.id)) {
           addPreparation(values)
             .then(() => {

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

@@ -178,7 +178,7 @@
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select v-decorator="['projectId', {rules: [{required: true, message: '项目不能为空'}]}]" placeholder="请选择">
+            <a-select v-decorator="['projectId']" placeholder="请选择">
               <a-select-option
                 v-for="{name,id} in treeData"
                 :key="id"