Merge remote-tracking branch 'origin/project1' into project1

src/api/processLibrary/InventoryRecord.js → src/api/processMangement/InventoryRecord.js

 import request from '@/utils/request'
 
+// TODO: 用来进行工序库的出入库记录的 分页+时间+普通字段的查询
 export function listLog(queryParams) {
-  console.log('this is date:', queryParams.dateRange)
   return request({
     url: '/wbwarehouselog/queryWbWarehouseLogByPagination',
     method: 'get',
     params: queryParams
   })
 }
+
+export function singleLogDetail(singleLogFqYs) {
+  return request({
+    url: ''
+  })
+}

src/views/processManagement/inventoryRecord/index.vue

@@ -142,8 +142,8 @@
             <el-form-item label="plocation：" prop="plocation">
               <el-input v-model.trim="singleDetails.plocation" :readonly="isReadOnly" />
             </el-form-item>
-            <el-form-item label="操作员：" prop="user">
-              <el-input v-model.trim="singleDetails.user" :readonly="isReadOnly" />
+            <el-form-item label="操作员：" prop="userName">
+              <el-input v-model.trim="singleDetails.userName" :readonly="isReadOnly" />
             </el-form-item>
           </el-col>
 
@@ -183,7 +183,7 @@
 </template>
 
 <script>
-import { listLog } from '@/api/processLibrary/InventoryRecord'
+import { listLog } from '@/api/processMangement/InventoryRecord'
 import BaseTable from '@/components/Table/BaseTable/index.vue'
 
 export default {
@@ -273,8 +273,8 @@ export default {
             return true
           }
         },
-        // column列,columType(列类型,可选text(默认为普通文字模式),input(input可编辑框),switch(switch开关),image(图片),operation(操作按钮))
-        // prop(参数),label(列名),width(宽度),align(对齐方式),sortable(是否支持排序)
+        // TODO: column列,columType(列类型,可选text(默认为普通文字模式),input(input可编辑框),switch(switch开关),image(图片),operation(操作按钮))
+        // TODO: :prop(参数),label(列名),width(宽度),align(对齐方式),sortable(是否支持排序)
         columnData: [
           {
             text: true,
@@ -312,7 +312,7 @@ export default {
           },
           {
             text: true,
-            prop: 'user',
+            prop: 'userName',
             label: '操作员',
             sortable: false,
             width: '150px'
@@ -352,9 +352,8 @@ export default {
         ptype: '',
         poperate: '',
         plocation: '',
-        remarks: '',
         fqYs: '',
-        user: '',
+        userName: '',
         createBy: '',
         updateBy: '',
         createDate: '',
@@ -458,6 +457,9 @@ export default {
 
     handleDetail: function(row) {
       console.log('success!')
+      if (row.poperate === '4') {
+
+      }
       this.title = '记录详情'
       this.singleDetails = { ...row }
       this.openDetails = true