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

src/components/Table/AllTableArguments/BaseTableArguments.js

@@ -80,9 +80,8 @@ export function BaseTableArguments(selection, loading, processList, queryParams,
   this.processList = processList
 }
 
-
 // TODO: 组件表单所需的所有参数
-export function BaseTableArgumentsTest(selection, loading, processList, queryParams, columnData) {
+export function BaseTableArgumentsTest(nIndex, selection, loading, processList, queryParams, columnData) {
   // TODO: 选择框是否需要存在    (selection判断表单选择框是否需要存在)
   if (typeof selection !== 'boolean') {
     console.warn('selection下拉框参数的type类型错误!请检查后重新赋值')
@@ -109,8 +108,7 @@ export function BaseTableArgumentsTest(selection, loading, processList, queryPar
     this.queryParams = queryParamsType
   }
 
+  this.nIndex = nIndex
   this.columnData = columnData
-
-
   this.processList = processList
 }

src/components/Table/BaseTable/index.vue

@@ -52,6 +52,7 @@
           <!--            </template>-->
           <!--          </el-table-column>-->
 
+          <el-table-column type="index" label="序号" width="50" :index="allTableArguments.nIndex" />
 
           <!-- TODO: 选择框是否开启，selectable控制是否单行禁用 -->
           <el-table-column v-if="allTableArguments.columObj.selection" type="selection" :selectable="allTableArguments.columObj.selectable" width="50px" />
@@ -77,6 +78,7 @@
               <span v-if="column.status && row[column.prop]">{{ row[column.prop].msg }}</span>
               <!-- 自定义内容 -->
               <span v-if="column.ownDefined">{{ column.ownDefinedReturn(row,$index) }}</span>
+
               <!-- TODO: 时间数据   -->
               <span v-if="column.time">{{ row[column.prop] | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
               <!-- switch开关 -->

src/views/processManagement/basicProcessManagement/index.vue

@@ -390,15 +390,15 @@ export default {
       this.open = !this.open
     },
     // TODO: 获取所选行详情信息操作
-    handleDetail(row) {
+    handleDetail(row, $index) {
       this.singleDetails = this.formReset
       this.singleDetails = row
       this.title = '详情信息'
       this.openDetails = !this.openDetails
     },
     /** TODO: 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset()
+    handleUpdate(row, $index) {
+      this.form = { ...this.formReset }
       this.title = '修改工序'
       const updProcessName = row.processName
       for (const pd of this.simulateProcessList) {
@@ -449,7 +449,7 @@ export default {
       return tip
     },
     /** TODO:删除按钮操作 */
-    handleDelete(row) {
+    handleDelete(row, $index) {
       this.$confirm('是否确认操作？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',