完善履历

src/utils/dict.js

@@ -325,7 +325,8 @@ DictCache.TYPE = {
   PROFESSOR_TYPE: 'PROFESSOR_TYPE',
   CHECK_LEVEL: 'CHECK_LEVEL',
   HIDDEN_DANGER_STATUS: 'HIDDEN_DANGER_STATUS',
-  SB_CHANGE_LOG_TYPE: 'SB_CHANGE_LOG_TYPE'
+  SB_CHANGE_LOG_TYPE: 'SB_CHANGE_LOG_TYPE',
+  CHECK_TYPE: 'CHECK_TYPE' // 强检
 }
 DictCache.CODE = {
 

src/views/activiti/task/MyTask.vue

@@ -45,7 +45,7 @@
 <script>
 import { STable, Ellipsis } from '@/components'
 import AssignForm from './modules/AssignForm'
-import DetailAuditScrap from '@/views/sb/scraps/modules/DetailAudit'
+import DetailAuditScrap from '@/views/sb/scraps/modules/DetailAudit.vue'
 import DetailYYAudit from '@/views/store/outstoreform/modules/DetailYYAudit'
 import { getTaskPage } from '@/api/activiti/activiti'
 import { fetchCustomFieldTemplateData, fetchCustomFieldTemplateVOData } from '@/api/customize/fieldTemplateData'
@@ -160,7 +160,9 @@ export default {
           const templateData = res.data
           const recordTemp = res.data
           recordTemp.taskId = record.taskId
+          recordTemp.dataRemark = recordTemp.remark
           recordTemp.remark = record.targetCode
+          console.log(222, recordTemp, templateData)
           this.$refs.detailAuditScrapModal.base(recordTemp, templateData)
         })
       } else {

src/views/sb/info/SbInfoC.vue

@@ -136,7 +136,18 @@
                       </a-select>
                     </a-form-item>
                   </a-col>
-
+                  <a-col :md="6" :sm="24" :style="{ display: expand ? 'block' : 'none' }">
+                    <a-form-item label="是否强检">
+                      <a-select v-model="queryParam.checkType" placeholder="请选择">
+                        <a-select-option
+                          v-for="(label,value) in checkTypeMap"
+                          :key="value"
+                          :label="label"
+                          :value="parseInt(value)">{{ label }}
+                        </a-select-option>
+                      </a-select>
+                    </a-form-item>
+                  </a-col>
                 </a-row>
               </a-form>
               <a-row :gutter="8">
@@ -393,6 +404,7 @@ export default {
       levelMap: {},
       lineMap: {},
       unitMap: {},
+      checkTypeMap: {},
       areaList: {},
       childMap: [],
       companyList: {},
@@ -511,7 +523,15 @@ export default {
           width: 120,
           checked: true
         },
-
+        {
+          title: '是否强检',
+          dataIndex: 'checkType',
+          width: 120,
+          checked: true,
+          customRender: (text, record, index) => {
+            return this.BaseTool.Object.getField(this.checkTypeMap, text)
+          }
+        },
         /* {
           title: '是否显示',
           dataIndex: 'isShow',
@@ -596,14 +616,13 @@ export default {
             }
           }
         }, */
-        // {
-        //   title: '状态',
-        //   checked: true,
-        //   dataIndex: 'status',
-        //   fixed: 'right',
-        //   width: 100,
-        //   scopedSlots: { customRender: 'status' }
-        // },
+        {
+          title: '状态',
+          checked: true,
+          dataIndex: 'status',
+          width: 100,
+          scopedSlots: { customRender: 'status' }
+        },
         // {
         //   title: '检定状态',
         //   checked: true,
@@ -653,6 +672,18 @@ export default {
           width: 200,
           dataIndex: 'createdUserName'
         },
+        {
+          title: '处理人员',
+          checked: true,
+          width: 200,
+          dataIndex: 'updateUserName'
+        },
+        {
+          title: '异常处理描述',
+          checked: true,
+          width: 200,
+          dataIndex: 'exceptionDescription'
+        },
         {
           title: '操作内容',
           checked: true,
@@ -704,7 +735,7 @@ export default {
     this.otherTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_MEASURE_OTHER_TYPE)
     console.log(11)
     console.log(this.otherTypeMap)
-
+    this.checkTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.CHECK_TYPE)
     this.depreciationTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBINFO_DEPRECIATIONTYPE)
     this.levelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBINFO_LEVEL)
     this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_INFO_STATUS)
@@ -987,21 +1018,17 @@ export default {
       this.$refs.importModalUpdate.base(null, 2)
     },
     rowClassName (record, index) {
-      if (record.measureStatus === 1) return 'orange'
+      if (record.measureStatus === 1 && record.status !== 7) return 'orange'
       console.log(record)
       switch (record.status) {
         case 1:
-          console.log(12)
           return 'green'
         case 3:
         case 4:
-          console.log(112)
-
           return 'red'
         case 5:
         case 6:
-          console.log(122)
-
+        case 7:
           return 'gray'
       }
     }

src/views/sb/info/modules/AddLogForm.vue

@@ -20,6 +20,12 @@
           </a-select-option>
         </a-select>
       </a-form-item>
+      <a-form-item label="处理人员">
+        <a-input v-decorator="['updateUserName', { rules: [{ required: true, message: '请输入处理人员' }] }]"/>
+      </a-form-item>
+      <a-form-item label="异常处理描述">
+        <a-textarea v-decorator="['exceptionDescription', { rules: [{ required: true, message: '请输入异常处理描述' }] }]"/>
+      </a-form-item>
       <a-form-item label="更改内容">
         <a-textarea
           v-decorator="['content', { rules: [{ required: true, message: '请输入更改内容' }] }]"

src/views/sb/info/modules/BaseForm.vue

@@ -191,6 +191,7 @@
         </a-col>
       </a-row>
       <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
             label="状态"
@@ -207,6 +208,22 @@
             </a-select>
           </a-form-item>
         </a-col>
+        <a-col :lg="12" :md="24" :sm="24" v-if="useType===4">
+          <a-form-item
+            label="是否强检"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-select v-decorator="['checkType', {rules: [{required: true, message: '请选择'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="(label,value) in checkTypeMap"
+                :key="value"
+                :label="label"
+                :value="parseInt(value)">{{ label }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
       </a-row>
       <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
         <!--        <a-col :lg="12" :md="24" :sm="24">
@@ -1041,6 +1058,7 @@ export default {
       colorMap: {},
       useTypeMap: {},
       statusMap: {},
+      checkTypeMap: {},
       isChildMap: {},
       isShowMap: {},
       yesNoMap: {},
@@ -1090,6 +1108,7 @@ export default {
     this.colorMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_COLOR)
     this.rlTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.RANLIAO_TYPE)
     this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_INFO_STATUS)
+    this.checkTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.CHECK_TYPE)
     this.unitMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBINFO_UNIT)
     this.sourceTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBTYPE_SOURCETYPE)
     this.useTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_USE_TYPE)
@@ -1215,6 +1234,7 @@ export default {
         setFieldsValue(Object.assign(pick(record, [
           'id',
           'no',
+          'checkType',
           'parentId',
           'positionNo',
           'ppNo',

src/views/sb/scraps/modules/DetailAudit.vue

@@ -48,6 +48,7 @@
       <detail-list-item term="成本归属">{{ model.feeFrom }}</detail-list-item>
       <detail-list-item term="项目名称">{{ model.projectName }}</detail-list-item>
       <detail-list-item term="仓库名称">{{ model.storeName }}</detail-list-item>
+      <detail-list-item term="备注">{{ model.dataRemark }}</detail-list-item>
     </detail-list>
     <title-divider v-show="storeInfo" title="备件明细" width="90px"></title-divider>
     <a-table