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

src/components/Table/AllTableArguments/BaseTableArguments.js

@@ -107,8 +107,6 @@ export function BaseTableArgumentsTest(nIndex, selection, loading, processList,
   if (queryParams instanceof queryParamsType) {
     this.queryParams = queryParamsType
   }
-
-  this.nIndex = nIndex
   this.columnData = columnData
   this.processList = processList
 }

src/components/Table/BaseTable/index.vue

@@ -12,7 +12,7 @@
           @selection-change="handleSelectionChange"
         >
 
-          <el-table-column type="index" label="序号" width="50" :index="allTableArguments.nIndex" />
+          <el-table-column type="index" label="序号" width="50" :index="nIndex" />
 
           <!-- TODO: 选择框是否开启，selectable控制是否单行禁用 -->
           <el-table-column v-if="allTableArguments.columObj.selection" type="selection" :selectable="allTableArguments.columObj.selectable" width="50px" />
@@ -30,7 +30,7 @@
             :index="columIndex"
             show-overflow-tooltip
           >
-            <template v-slot="{row,$index}">
+            <template slot-scope="{row,$index}">
 
               <!-- 默认展示 -->
               <span v-if="column.text && column.editRow !== $index">{{ row[column.prop] || '-' }}</span>
@@ -60,9 +60,9 @@
               <!-- 操作按钮 -->
               <span v-if="column.isOperation" class="processListBtns">
                 <span v-for="(operations, index) in column.operation" :key="index">
-                  <el-button v-if=" operations.clickType === '1' " :icon="operations.icon" :type="typeParent" :style="{color:operations.color}" :size="size" @click="handleDetail">{{ operations.label }}</el-button>
-                  <el-button v-else-if=" operations.clickType === '2' " :icon="operations.icon" :type="typeParent" :style="{color:operations.color}" :size="size" @click="handleUpdate">{{ operations.label }}</el-button>
-                  <el-button v-else-if=" operations.clickType === '3' " :icon="operations.icon" :type="typeParent" :style="{color:operations.color}" :size="size" @click="handleDelete">{{ operations.label }}</el-button>
+                  <el-button v-if=" operations.clickType === '1' " :icon="operations.icon" :type="typeParent" :style="{color:operations.color}" :size="size" @click="handleDetail(row,$index)">{{ operations.label }}</el-button>
+                  <el-button v-else-if=" operations.clickType === '2' " :icon="operations.icon" :type="typeParent" :style="{color:operations.color}" :size="size" @click="handleUpdate(row,$index)">{{ operations.label }}</el-button>
+                  <el-button v-else-if=" operations.clickType === '3' " :icon="operations.icon" :type="typeParent" :style="{color:operations.color}" :size="size" @click="handleDelete(row,$index)">{{ operations.label }}</el-button>
                 </span>
               </span>
             </template>
@@ -76,7 +76,7 @@
 
 <script>
 
-import {BaseTableArgumentsTest} from '@/components/Table/AllTableArguments/BaseTableArguments'
+import { BaseTableArgumentsTest } from '@/components/Table/AllTableArguments/BaseTableArguments'
 
 export default {
   name: 'BaseTable',
@@ -93,16 +93,10 @@ export default {
         }
       }
     },
-    allNamed: {
-      type: Object,
+    nIndex: {
+      type: Function,
       default: () => {
-        return {
-          listName: String,
-          label: {
-            SerialNumberNamed: String
-          }
-
-        }
+        return Function
       }
     }
   },
@@ -131,7 +125,6 @@ export default {
 /* TODO: 这里是控制内容列表的样式 */
 .processListBtns {
   .el-button {
-    margin: 0 12px;
   }
 }
 

src/views/equipment/basicInfo.vue

@@ -86,9 +86,9 @@
             {{ scope.row.prank || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作员" prop="createBy">
+        <el-table-column label="操作员" prop="createName">
           <template slot-scope="scope">
-            {{ scope.row.createBy || '-' }}
+            {{ scope.row.createName || '-' }}
           </template>
         </el-table-column>
         <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createTime" width="200px">

src/views/equipment/check.vue

@@ -349,7 +349,10 @@ export default {
         roleName: undefined,
         roleKey: undefined,
         flag: undefined,
-        ptype: 1
+        ptype: 1,
+        pstatus:0,
+        delFlag:0
+        
       },
       // 表单参数
       form: {

src/views/equipment/checkProcess.vue

@@ -346,8 +346,9 @@ export default {
       queryParams: {
         page: 1,
         rows: 10,
-        
-        ptype: 2
+        ptype: 2,
+        pstatus:0,
+        delFlag:0
       },
       // 表单参数
       form: {

src/views/equipment/draw.vue

@@ -12,9 +12,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="phd" prop="phd">
+      <el-form-item label="phd" prop="phdStr">
         <el-input
-          v-model="queryParams.phd"
+          v-model="queryParams.phdStr"
           placeholder="请输入phd"
           clearable
           size="small"
@@ -22,9 +22,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="prank" prop="prank">
+      <el-form-item label="prank" prop="prankStr">
         <el-input
-          v-model="queryParams.prank"
+          v-model="queryParams.prankStr"
           placeholder="请输入prank"
           clearable
           size="small"
@@ -67,25 +67,15 @@
             {{ scope.row.pissb || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="pstatus" prop="pstatus">
-          <template slot-scope="scope">
-            {{ scope.row.pstatus || '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="ptype" prop="ptype">
-          <template slot-scope="scope">
-            {{ scope.row.ptype || '-' }}
-          </template>
-        </el-table-column>
         <el-table-column label="状态" prop="pstatus">
           <template slot-scope="scope">
             <span v-if="scope.row.pstatus === '0'" style="color: red">未完成</span>
             <span v-else style="color: green">已完成</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作员" prop="createBy">
+        <el-table-column label="操作员" prop="createName">
           <template slot-scope="scope">
-            {{ scope.row.createBy || '-' }}
+            {{ scope.row.createName || '-' }}
           </template>
         </el-table-column>
         <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createTime" width="200px">
@@ -100,7 +90,7 @@
               type="text"
               style="color: #49cec9"
               @click="handleUpdate(scope.row)"
-            >修改</el-button>
+            >处理</el-button>
             <el-button
               size="mini"
               type="text"

src/views/equipment/equipmentAbandonment.vue

@@ -346,7 +346,9 @@ export default {
         roleName: undefined,
         roleKey: undefined,
         flag: undefined,
-        ptype:2
+        ptype:2,
+        pstatus:0,
+        delFlag:0
       },
       // 表单参数
       form: {

src/views/processManagement/basicProcessManagement/index.vue

@@ -698,6 +698,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+/* TODO: 专门用来解决input 的边框问题 */
 .aboutSingleDetails{
   .el-form-item{
     .el-input >>> .el-input__inner {

src/views/processManagement/draw.vue

@@ -67,25 +67,15 @@
             {{ scope.row.pissb || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="pstatus" prop="pstatus">
-          <template slot-scope="scope">
-            {{ scope.row.pstatus || '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="ptype" prop="ptype">
-          <template slot-scope="scope">
-            {{ scope.row.ptype || '-' }}
-          </template>
-        </el-table-column>
         <el-table-column label="状态" prop="pstatus">
           <template slot-scope="scope">
             <span v-if="scope.row.pstatus === '0'" style="color: red">未完成</span>
             <span v-else style="color: green">已完成</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作员" prop="createBy">
+        <el-table-column label="操作员" prop="createName">
           <template slot-scope="scope">
-            {{ scope.row.createBy || '-' }}
+            {{ scope.row.createName || '-' }}
           </template>
         </el-table-column>
         <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createTime" width="200px">
@@ -100,7 +90,7 @@
               type="text"
               style="color: #49cec9"
               @click="handleUpdate(scope.row)"
-            >修改</el-button>
+            >处理</el-button>
             <el-button
               size="mini"
               type="text"