筹建优化

src/views/Login.vue

@@ -245,6 +245,7 @@ export default {
       // 记住密码
       cookie.set('remberMe', this.remberMe, 7)
       cookie.set('username', this.form.getFieldValue('username'), 7)
+      cookie.set('repairTips', 1, 7)
       if (this.remberMe) {
         cookie.set('password', this.password, 7)
       } else {

src/views/preparation/preparation/Building.vue

@@ -96,7 +96,7 @@ export default {
           dataIndex: 'name'
         },
         {
-          title: '上层建筑物',
+          title: '公司',
           dataIndex: 'parentId',
           customRender: (text, record, index) => {
             return record.parentName

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

@@ -26,29 +26,26 @@
         </row-item>
         <row-item>
           <a-form-item
-            label="公司"
+            label="报修时间"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select @change="handleCompanyList"  v-decorator="['parentPositionId']" placeholder="请选择">
-              <a-select-option
-                v-for="({id, name}) in companyList"
-                :key="id"
-                :label="name"
-                :value="id">{{ name }}
-              </a-select-option>
-            </a-select>
+            <a-date-picker
+              showTime
+              style="width: 100%"
+              :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN"
+              v-decorator="['applyTime', {rules: [{required: true, message: '报修时间不能为空'}]}]" />
           </a-form-item>
         </row-item>
         <row-item>
           <a-form-item
-            label="建筑物"
+            label="公司"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select v-decorator="['positionId']" placeholder="请选择">
+            <a-select @change="handleCompanyList"  v-decorator="['parentPositionId', {rules: [{required: true, message: '公司不能为空'}]}]" placeholder="请选择">
               <a-select-option
-                v-for="({id, name}) in sbPositionList"
+                v-for="({id, name}) in companyList"
                 :key="id"
                 :label="name"
                 :value="id">{{ name }}
@@ -57,30 +54,33 @@
           </a-form-item>
         </row-item>
         <row-item>
+
           <a-form-item
-            label="报修时间"
+            label="要求完成日期"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
             <a-date-picker
-              showTime
               style="width: 100%"
-              :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN"
-              v-decorator="['applyTime', {rules: [{required: true, message: '报修时间不能为空'}]}]" />
+              :format="BaseTool.Date.PICKER_NORM_DATE_PATTERN"
+              v-decorator="['limitHours', {rules: [{required: true, message: '要求完成日期不能为空'}]}]" />
+
           </a-form-item>
         </row-item>
         <row-item>
-
           <a-form-item
-            label="要求完成日期"
+            label="建筑物"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-date-picker
-              style="width: 100%"
-              :format="BaseTool.Date.PICKER_NORM_DATE_PATTERN"
-              v-decorator="['limitHours', {rules: [{required: true, message: '要求完成日期不能为空'}]}]" />
-
+            <a-select v-decorator="['positionId', {rules: [{required: true, message: '建筑物不能为空'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="({id, name}) in sbPositionList"
+                :key="id"
+                :label="name"
+                :value="id">{{ name }}
+              </a-select-option>
+            </a-select>
           </a-form-item>
         </row-item>
         <row-item>
@@ -215,10 +215,11 @@ export default {
     base (record, companyList) {
       this.visible = true
       this.companyList = companyList
+      this.sbPositionList = []
       // 如果是空标识添加
       if (this.BaseTool.Object.isBlank(record)) {
         this.modalTitle = '添加工单'
-        this.saveTitle = '保存'
+        this.saveTitle = '提交'
         return
       }
       // 获取工单下的建筑物

src/views/workplace/backlog/NewWorkplaceBacklog.vue

@@ -206,6 +206,7 @@ import { getArticlePage, fetchArticle } from '@/api/operate/article'
 import { getWorkplaceBacklogUserPage, getWorkplaceBacklogTopData, getWorkplaceBacklogWeekData, getWorkplaceBacklogPie } from '@/api/workplace/backlog'
 import { getCalendarNotice } from '@/api/repair/application-form'
 import { Chart } from '@antv/g2'
+import cookie from 'vue-cookie'
 export default {
   name: 'NewWorkplaceBacklog',
   components: {
@@ -485,29 +486,33 @@ export default {
       this.chartLine.render()
     },
     toCalendar () {
-      /* getCalendarNotice().then(res => {
-        const router = this.$router
-        if (res.data.calendar_date !== null) {
-          this.$confirm({
-            title: '提示',
-            content: '七天内需要完成的任务!',
-            okText: '去查看',
-            icon: 'info-circle',
-            onOk () {
-              return new Promise((resolve, reject) => {
-                router.push({ path: '/repaire/calendar' })
-                resolve()
-              }).catch(err => {
-                this.$message.error({
-                  title: '错误',
-                  description: err.message
+      let repairTips = cookie.get('repairTips')
+      if (repairTips === '1') {
+        getCalendarNotice().then(res => {
+          const router = this.$router
+          cookie.set('repairTips', 2, 7)
+          if (res.data !== null && res.data.length > 0) {
+            this.$confirm({
+              title: '提示',
+              content: '七天内需要完成的任务!',
+              okText: '去查看',
+              icon: 'info-circle',
+              onOk () {
+                return new Promise((resolve, reject) => {
+                  router.push({ path: '/repaire/calendar' })
+                  resolve()
+                }).catch(err => {
+                  this.$message.error({
+                    title: '错误',
+                    description: err.message
+                  })
                 })
-              })
-            },
-            onCancel () {}
-          })
-        }
-      }) */
+              },
+              onCancel () {}
+            })
+          }
+        })
+      }
     }
   }
 }

src/views/workplace/backlog/WorkplaceBacklog.vue

@@ -106,6 +106,7 @@ import DetailAuditScrap from '@/views/sb/scrap/modules/DetailAuditScrap'
 import DetailScrap from '@/views/sb/scrap/modules/Detail'
 import DetailPreparationModal from '@/views/preparation/preparation/modules/Detail'
 import { fetchPreparation } from '@/api/preparation/preparation'
+import cookie from 'vue-cookie'
 
 export default {
   name: 'Workplace',
@@ -449,29 +450,40 @@ export default {
       this.$refs.table.refresh()
     },
     toCalendar () {
-      /* getCalendarNotice().then(res => {
-        const router = this.$router
-        if (res.data.calendar_date !== null) {
-          this.$confirm({
-            title: '提示',
-            content: '七天内需要完成的任务!',
-            okText: '去查看',
-            icon: 'info-circle',
-            onOk () {
-              return new Promise((resolve, reject) => {
-                router.push({ path: '/repaire/calendar' })
-                resolve()
-              }).catch(err => {
-                this.$message.error({
-                  title: '错误',
-                  description: err.message
+      let repairTips = cookie.get('repairTips')
+      if (repairTips === '1') {
+        getCalendarNotice().then(res => {
+          const router = this.$router
+          cookie.set('repairTips', 2, 7)
+          if (res.data !== null && res.data.length > 0) {
+            let infoStr = ''
+            res.data.forEach(res => {
+              infoStr += res.calendarDate
+              infoStr += ' : '
+              infoStr += res.num
+              infoStr += '\t'
+            })
+            this.$confirm({
+              title: '提示',
+              content: '近一周工单任务如下:<br>' + infoStr,
+              okText: '去查看',
+              icon: 'info-circle',
+              onOk () {
+                return new Promise((resolve, reject) => {
+                  router.push({ path: '/repaire/calendar' })
+                  resolve()
+                }).catch(err => {
+                  this.$message.error({
+                    title: '错误',
+                    description: err.message
+                  })
                 })
-              })
-            },
-            onCancel () {}
-          })
-        }
-      }) */
+              },
+              onCancel () {}
+            })
+          }
+        })
+      }
     }
   }
 }