领料出库

src/views/dashboard/modules/DetailRepairReport.vue

@@ -12,7 +12,6 @@
       :data-source="data"
       :columns="columns"
       :scroll="{x: 1000, y: BaseTool.Constant.scrollY}"
-      tableLayout="auto"
       rowKey="id"
     >
       <span slot="action" slot-scope="record">
@@ -85,6 +84,29 @@ export default {
             return record.sbName
           }
         },
+        {
+          title: '设备位号',
+          checked: true,
+          width: '120px',
+          dataIndex: 'positionNo'
+        },
+        {
+          title: '车间位置',
+          checked: true,
+          width: '120px',
+          dataIndex: 'sbPositionName'
+        },
+        {
+          title: '维修专业',
+          checked: true,
+          width: '120px',
+          dataIndex: 'repairProfessor',
+          customRender: (text, record, index) => {
+            return text.split(',').map(item => {
+              return this.BaseTool.Object.getField(this.professorMap, item)
+            }).join(',')
+          }
+        },
         {
           title: '报修人',
           checked: true,
@@ -115,6 +137,15 @@ export default {
             return this.BaseTool.Object.getField(this.planFlagMap, text)
           }
         },
+        {
+          title: '送修部门',
+          checked: true,
+          width: '150px',
+          dataIndex: 'repairDeptName',
+          customRender: (text, record, index) => {
+            return text
+          }
+        },
         {
           title: '报修时间',
           checked: true,
@@ -169,6 +200,12 @@ export default {
             }
           }
         },
+        {
+          title: '问题描述',
+          checked: true,
+          width: '120px',
+          dataIndex: 'content'
+        },
         {
           title: '报修状态',
           checked: true,
@@ -177,6 +214,7 @@ export default {
           fixed: 'right',
           scopedSlots: { customRender: 'status' }
         },
+
         {
           title: '操作',
           checked: true,
@@ -192,6 +230,7 @@ export default {
       levelMap: {},
       needStopMap: {},
       planFlagMap: {},
+      professorMap:{},
       data: []
     }
   },
@@ -202,6 +241,8 @@ export default {
     this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_STATUS)
     this.needStopMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
     this.planFlagMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_CATEGORY)
+    this.professorMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_PROFESSOR)
+
   },
   methods: {
     base (record) {

src/views/repair/application-form/RepairForm.vue

@@ -71,6 +71,18 @@
                 </a-select>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="维修专业">
+                <a-select v-model="queryParam.repairProfessor" placeholder="请选择">
+                  <a-select-option
+                    v-for="(label,value) in professorMap"
+                    :key="value"
+                    :label="label"
+                    :value="parseInt(value)">{{ label }}
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
             <a-col :md="8 || 24" :sm="24">
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" @click="handleOk()">查询</a-button>
@@ -374,6 +386,7 @@ export default {
       categoryMap: {},
       needStopMap: {},
       planFlagMap: {},
+      professorMap:{},
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         parameter = {
@@ -428,6 +441,8 @@ export default {
     this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_STATUS)
     this.needStopMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
     this.planFlagMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_CATEGORY)
+    this.professorMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_PROFESSOR)
+
     // 获取浏览器的请求参数：报修单编号：no
     const no = this.$route.query.no
     if (no != null) {

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

@@ -456,6 +456,7 @@ export default {
         if (this.model != null) {
           values.pickId = this.model.id
         }
+        values.oldOrNew = this.tokenType
         values.userTime = BaseTool.Date.formatter(values.userTime, BaseTool.Date.PICKER_NORM_DATE_PATTERN)
         // 日期处理
         if (this.BaseTool.String.isBlank(values.id)) {