优化house_log日志以及完善样品库日志的api接口和显示问题

Signed-off-by: CenXinYi <2810162984@qq.com>

src/api/sample/inventoryRecord.js

@@ -14,11 +14,11 @@ export function listLog(queryParams, queryMaps) {
 }
 
 /* TODO: 用来查询单项出入库记录的废弃详情信息 */
-export function findSingleLogDetail(singleLogIdAndUser) {
+export function findSingleLogDetail(singleLogIdAndPn) {
   return request({
     url: '/wbchemistrylog/detail',
     method: 'post',
-    data: singleLogIdAndUser,
+    data: singleLogIdAndPn,
     headers: {
       'Content-Type': 'application/json;charset=UTF-8'
     }

src/components/Table/AllTableArguments/BaseTableArguments.js

-// TODO: 查询条件  (检查查询条件的类型）
+// TODO: 组件表单所需的所有参数（未完善类型检测）
+export function BaseTableArgumentsTest(listName, loading, List, queryParams, columObj) {
+  this.listName = listName
+  this.loading = loading
+  this.List = List
+  this.queryParams = queryParams
+  this.columObj = columObj
+}
+
+// TODO: 以下导出皆暂时不可用，都未完善
 
+// 查询条件  (检查查询条件的类型）
 export function queryParamsType(pageNum, pageSize, pageTotal) {
   if (typeof pageNum !== 'number' && typeof pageSize !== 'number' && typeof pageTotal !== 'number') {
     console.warn('queryParams查询参数的type类型错误!请检查后重新赋值')
@@ -11,7 +21,7 @@ export function queryParamsType(pageNum, pageSize, pageTotal) {
   }
 }
 
-// TODO: 操作选项的类型判断
+// 操作选项的类型判断
 export function operationType(type, label, icon, color, buttonClick, isShow) {
   this.type = type
   this.label = label
@@ -23,7 +33,7 @@ export function operationType(type, label, icon, color, buttonClick, isShow) {
   }
 }
 
-// TODO: 列的类型以及参数判断
+// 列的类型以及参数判断
 export function columnDataType(text, status, ownDefined, isSwitch, image, isOperation, prop, label, width, align, operation) {
   this.text = text
   this.status = status
@@ -44,7 +54,7 @@ export function columnDataType(text, status, ownDefined, isSwitch, image, isOper
   }
 }
 
-// TODO: 组件表单所需的所有参数
+// 组件表单所需的所有参数
 export function BaseTableArguments(selection, loading, processList, queryParams, columnData) {
   // TODO: 选择框是否需要存在    (selection判断表单选择框是否需要存在)
   if (typeof selection !== 'boolean') {
@@ -60,19 +70,19 @@ export function BaseTableArguments(selection, loading, processList, queryParams,
     }
   }
 
-  // TODO: 加载进度    (判断是否显示加载进度)
+  // 加载进度    (判断是否显示加载进度)
   if (typeof loading !== 'boolean') {
     console.warn('loading进度条参数的type类型错误!请检查后重新赋值')
   } else {
     this.loading = loading
   }
 
-  // TODO: 查询参数    (判断查询条件是否符合类型)
+  // 查询参数    (判断查询条件是否符合类型)
   if (queryParams instanceof queryParamsType) {
     this.queryParams = queryParamsType
   }
 
-  // TODO: 每一列的参数
+  //  每一列的参数
   if (columnData instanceof columnDataType) {
     this.columnData = columnData
   }
@@ -80,11 +90,3 @@ export function BaseTableArguments(selection, loading, processList, queryParams,
   this.processList = processList
 }
 
-// TODO: 组件表单所需的所有参数
-export function BaseTableArgumentsTest(listName, loading, List, queryParams, columObj) {
-  this.listName = listName
-  this.loading = loading
-  this.List = List
-  this.queryParams = queryParams
-  this.columObj = columObj
-}

src/views/processManagement/inventoryRecord/index.vue

@@ -480,7 +480,6 @@ export default {
     /** TODO: 重置按钮操作 */
     resetQuery() {
       this.queryEntity = {
-        tableSortMark: 0,
         entity: {
           pn: '',
           lot: '',
@@ -496,7 +495,7 @@ export default {
     /* TODO: 控制单项表单关闭的详情 */
     handleClose() {
       this.activateAbandonedState = false
-      this.singleLogIdAndPn= {}
+      this.singleLogIdAndPn = {}
     },
     /* TODO: 进行排序 */
     changeTableSort: function(val) {

src/views/sample/inventoryRecord/index.vue

@@ -138,34 +138,6 @@
           </el-col>
         </el-row>
 
-        <!-- TODO: 这里是 库状态为废弃时才会触发显示的模块 -->
-        <transition name="fade-transform" mode="out-in">
-          <el-row v-if=" activateAbandonedState " style="height: 160px">
-            <el-col :span="12">
-              <el-form-item label="fq_ys：" prop="fq_ys">
-                {{ singleDetails.fq_ys }}
-              </el-form-item>
-              <el-form-item label="fq_bz：" prop="fq_bz">
-                {{ singleDetails.fq_bz }}
-              </el-form-item>
-              <el-form-item label="fq_dbxi：" prop="fq_dbxi">
-                {{ singleDetails.fq_dbxi }}
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="fq_dd：" prop="fq_dd">
-                {{ singleDetails.fq_dd }}
-              </el-form-item>
-              <el-form-item label="fq_mcode：" :label-width="10" prop="fq_mcode">
-                {{ singleDetails.fq_mcode }}
-              </el-form-item>
-              <el-form-item label="fq_yy：" prop="fq_yy">
-                {{ singleDetails.fq_yy }}
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </transition>
-
         <el-row>
           <el-col :span="12">
             <el-form-item label="操作员：" prop="userName">
@@ -337,14 +309,13 @@ export default {
         ]
       },
 
+      // TODO: 表单里的单项详情参数
       title: '',
       openDetails: false,
       isReadOnly: true,
-      // TODO: 表单里的单项详情参数
       singleDetails: {},
       // TODO: 获取表单单项详情的参数
-      singleLogIdAndFqYs: {},
-      activateAbandonedState: false
+      singleLogIdAndPn: {}
     }
   },
   computed: {
@@ -416,14 +387,20 @@ export default {
     },
     /** TODO: 重置按钮操作 */
     resetQuery() {
-      this.resetForm('queryForm')
+      this.queryEntity = {
+        entity: {
+          pn: '',
+          lot: '',
+          ptype: ''
+        }
+      }
+      this.dateRange = []
       this.handleQuery()
     },
 
     /* TODO: 控制单项表单关闭的详情 */
     handleClose() {
-      this.activateAbandonedState = false
-      this.singleLogIdAndFqYs = {}
+      this.singleLogIdAndPn = {}
     },
     /* TODO: 进行排序 */
     changeTableSort: function(val) {
@@ -444,25 +421,13 @@ export default {
         this.singleDetails = { ...row }
       } else {
         /* TODO: 设置单项详情的查询的条件 */
-        this.singleLogIdAndFqYs['businessId'] = row.businessId
-
-        this.singleLogIdAndFqYs['fqYs'] = row.fqYs
-        /* TODO: 进行查询，如果返回的code为200，则表示返回的值成功 */
-        findSingleLogDetail(this.singleLogIdAndFqYs).then(
+        this.singleLogIdAndPn['businessId'] = row.businessId
+        this.singleLogIdAndPn['pn'] = row.pn
+        /* TODO: 进行单项详情的查询 */
+        findSingleLogDetail(this.singleLogIdAndPn).then(
           response => {
-            if (response.code === 200) {
-              this.singleDetails = Object.assign({}, response.data, { ...row })
-              /* TODO: 如果库状态==='4'  并且返回的状态码为200的时候，才会将可变的详情字段设置为true，去激活并打开 */
-              this.activateAbandonedState = true
-            } else {
-              /* TODO: 如果状态码不对则不会激活可变字段，只会对普通字段进行赋值,并且抛出错误信息response.message */
-              this.$message({
-                showClose: true,
-                message: response.message,
-                type: 'warning'
-              })
-              this.singleDetails = { ...row }
-            }
+            this.title = '记录详情'
+            this.singleDetails = Object.assign({}, response.data, { ...row })
           }
         )
       }