bugfix

src/views/modules/doc/doc-list.vue

@@ -6,6 +6,20 @@
         <el-form-item label="名称">
           <el-input v-model="dataForm.fileName" placeholder="文件名称" clearable/>
         </el-form-item>
+        <el-form-item label="文件类别">
+          <el-select
+            v-model="dataForm.fileType"
+            placeholder="请选择"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="item in optionsFileType"
+              :key="item.code"
+              :label="item.value"
+              :value="item.code">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button @click="queryPage()">查询</el-button>
           <el-button v-if="isAuth('doc:ctl:save')" type="primary" @click="addOrUpdateHandle(0)">上传文件</el-button>
@@ -173,9 +187,9 @@
           url: this.$http.adornUrl('/file-service/document-ctl/list'),
           method: 'get',
           params: this.$http.adornParams({
+            ...this.dataForm,
             'current': this.pageIndex,
-            'size': this.pageSize,
-            'fileName': this.dataForm.fileName ? this.dataForm.fileName : null
+            'size': this.pageSize
           })
         }).then(({data}) => {
           if (data && data.code === '200') {

src/views/modules/production/recording.vue

@@ -24,27 +24,46 @@
           width="50"
           align="center">
         </el-table-column>
+        <el-table-column
+          prop="productNumber"
+          header-align="center"
+          align="center"
+          min-width="100"
+          :show-tooltip-when-overflow="true"
+          label="物料编号">
+        </el-table-column>
         <el-table-column
           prop="productName"
           header-align="center"
           align="center"
-          min-width="140"
+          min-width="160"
           :show-tooltip-when-overflow="true"
           label="物料名称">
         </el-table-column>
         <el-table-column
-          prop="productNumber"
+          prop="deliveryDate"
           header-align="center"
           align="center"
-          min-width="100"
-          :show-tooltip-when-overflow="true"
-          label="物料编号">
+          min-width="160"
+          label="交期时间">
+        </el-table-column>
+        <el-table-column
+          prop="warningState"
+          header-align="center"
+          align="center"
+          min-width="60"
+          label="预警状态">
+          <template slot-scope="scope">
+            <el-tag v-if="Number(scope.row.warningState) === 1">正常</el-tag>
+            <el-tag type="warning" v-if="Number(scope.row.warningState) === 2">预警</el-tag>
+            <el-tag type="danger" v-if="Number(scope.row.warningState) === 3">超期</el-tag>
+          </template>
         </el-table-column>
         <el-table-column
           prop="contractNumber"
           header-align="center"
           align="center"
-          min-width="140"
+          min-width="120"
           :show-tooltip-when-overflow="true"
           label="合同号">
         </el-table-column>
@@ -57,19 +76,18 @@
           label="客户名称">
         </el-table-column>
         <el-table-column
+          fixed="right"
           prop="state"
           header-align="center"
           align="center"
+          :formatter="formatState"
           label="状态">
-          <template slot-scope="scope">
-            <span>{{scope.row.state?optionsState[Number(scope.row.state) - 3].value:''}}</span>
-          </template>
         </el-table-column>
         <el-table-column
           fixed="right"
           header-align="center"
           align="center"
-          width="150"
+          width="80"
           label="操作">
           <template slot-scope="scope">
             <el-button v-if="isAuth('prod:record:info')" type="text" size="small" @click="details(scope.row.id)">查看</el-button>
@@ -110,16 +128,16 @@ export default {
         dataListSelections: [],
         optionsState: [
           {
-            code: '3',
-            value: '完成'
+            code: '2', value: '待处理'
           },
           {
-            code: '4',
-            value: '不合格'
+            code: '3', value: '采购'
           },
           {
-            code: '5',
-            value: '报废'
+            code: '4', value: '委外'
+          },
+          {
+            code: '5', value: '生产'
           }
         ]
       }
@@ -181,6 +199,11 @@ export default {
       },
       closeDialogEvent () {
         this.detailsVisible = false
+      },
+      formatState (row) {
+        if (!row.state) return ''
+        const item1 = this.optionsState.find((item) => item.code === row.state.toString())
+        return item1 ? item1.value : ''
       }
     }
   }