修改bug

src/views/batchRecord/components/tables/materialTable.vue

@@ -76,7 +76,7 @@
           },
           {
             prop: 'code',
-            label: '领料单编号',
+            label: '领料单编码',
             align: 'center',
             minWidth: 110,
             showOverflowTooltip: true,
@@ -145,17 +145,18 @@
             placeholder: '请输入'
           },
           {
-            label: '领料编码：',
+            label: '领料单编码：',
             value: 'pickOrderCode',
             type: 'input',
-            placeholder: '请输入'
-          },
-          {
-            label: '领料名称：',
-            value: 'pickOrderName',
-            type: 'input',
-            placeholder: '请输入'
+            placeholder: '请输入',
+            labelWidth: 110
           }
+          // {
+          //   label: '领料名称：',
+          //   value: 'pickOrderName',
+          //   type: 'input',
+          //   placeholder: '请输入'
+          // }
         ];
       }
     },

src/views/batchRecord/components/tables/qualityWorkOrderTable.vue

@@ -149,19 +149,22 @@
             label: '生产工单编码',
             value: 'workOrderCode',
             type: 'input',
-            placeholder: '请输入'
+            placeholder: '请输入',
+            labelWidth: 110
           },
           {
             label: '质检工单编码',
             value: 'code',
             type: 'input',
-            placeholder: '请输入'
+            placeholder: '请输入',
+            labelWidth: 110
           },
           {
             label: '质检工单名称',
             value: 'name',
             type: 'input',
-            placeholder: '请输入'
+            placeholder: '请输入',
+            labelWidth: 110
           }
         ];
       }

src/views/pick/pickApply/index.vue

@@ -17,6 +17,7 @@
         :pageSize="20"
         :height="tableHeight"
         @fullscreen-change="fullscreenChange"
+        row-key="id"
       >
         <template v-slot:toolbar>
           <el-button
@@ -313,7 +314,3 @@
     }
   };
 </script>
-
-
-
-

src/views/produce/components/qualityInspection/components/selfInspectionReporting.vue

@@ -0,0 +1,270 @@
+<template>
+  <ele-modal
+    :before-close="cancel"
+    :close-on-click-modal="false"
+    :maxable="true"
+    title="首件两检报工"
+    :visible.sync="visible"
+    v-if="visible"
+    append-to-body
+    custom-class="ele-dialog-form"
+    width="60vw"
+  >
+    <el-form
+      ref="form"
+      :model="form"
+      :rules="rules"
+      label-position="right"
+      label-width="110px"
+    >
+      <headerTitle style="margin-top: 15px" title="基本信息" />
+      <el-row :gutter="10" class="basic">
+        <el-col :lg="8" :md="12" :sm="12" :xl="8" :xs="12">
+          <el-form-item label="工序类型：">
+            <el-input v-model="form.order" disabled></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :lg="8" :md="12" :sm="12" :xl="8" :xs="12">
+          <el-form-item label="工序名称：">
+            <el-input v-model="form.order" disabled></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :lg="8" :md="12" :sm="12" :xl="8" :xs="12">
+          <el-form-item label="产品编码：">
+            <el-input v-model="form.order" disabled></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :lg="8" :md="12" :sm="12" :xl="8" :xs="12">
+          <el-form-item label="零件名称：">
+            <el-input v-model="form.order" disabled></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :lg="8" :md="12" :sm="12" :xl="8" :xs="12">
+          <el-form-item label="零部件编码：">
+            <el-input v-model="form.order" disabled></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :lg="8" :md="12" :sm="12" :xl="8" :xs="12">
+          <el-form-item label="批次号：">
+            <el-input v-model="form.order" disabled></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :lg="8" :md="12" :sm="12" :xl="8" :xs="12">
+          <el-form-item label="首件编码：">
+            <el-input v-model="form.order" disabled></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :lg="8" :md="12" :sm="12" :xl="8" :xs="12">
+          <el-form-item label="自检报工时间：">
+            <el-input v-model="form.order" disabled></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <headerTitle style="margin-top: 15px" title="过程控制" />
+
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="工艺、图纸是否有效：" label-width="200px">
+            <el-radio-group v-model="form.feedNeedTurnover">
+              <el-radio
+                :label="item.value"
+                v-for="(item, i) in radioList"
+                :key="i"
+                >{{ item.name }}</el-radio
+              >
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="设备是否完好：" label-width="200px">
+            <el-radio-group v-model="form.feedNeedTurnover">
+              <el-radio
+                :label="item.value"
+                v-for="(item, i) in radioList"
+                :key="i"
+                >{{ item.name }}</el-radio
+              >
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="工装是否合格：" label-width="200px">
+            <el-radio-group v-model="form.feedNeedTurnover">
+              <el-radio
+                :label="item.value"
+                v-for="(item, i) in radioList"
+                :key="i"
+                >{{ item.name }}</el-radio
+              >
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="量具是否合格并在有效期内：" label-width="200px">
+            <el-radio-group v-model="form.feedNeedTurnover">
+              <el-radio
+                :label="item.value"
+                v-for="(item, i) in radioList"
+                :key="i"
+                >{{ item.name }}</el-radio
+              >
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="数控程序是否确认：" label-width="200px">
+            <el-radio-group v-model="form.feedNeedTurnover">
+              <el-radio
+                :label="item.value"
+                v-for="(item, i) in radioList"
+                :key="i"
+                >{{ item.name }}</el-radio
+              >
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="原材料或半成品是否合格：" label-width="200px">
+            <el-radio-group v-model="form.feedNeedTurnover">
+              <el-radio
+                :label="item.value"
+                v-for="(item, i) in radioList"
+                :key="i"
+                >{{ item.name }}</el-radio
+              >
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <headerTitle style="margin-top: 15px" title="检查项目" />
+      <ele-pro-table
+        ref="table"
+        row-key="id"
+        :columns="columns"
+        :datasource="list"
+        cache-key="mes-selfInspectionRequest-20251201"
+        autoAmendPage
+        :need-page="false"
+        @refresh="getData"
+        :selection.sync="selection"
+      ></ele-pro-table>
+    </el-form>
+
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">取 消</el-button>
+      <el-button type="primary" @click="submitSelf">提交</el-button>
+      <el-button type="primary" @click="saveSelf">保存</el-button>
+    </span>
+  </ele-modal>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        visible: false,
+        form: { order: '', feedNeedTurnover: 1 },
+        rules: {},
+        radioList: [
+          {
+            name: '是',
+            value: 1
+          },
+          {
+            name: '否',
+            value: 0
+          }
+        ],
+        list: []
+      };
+    },
+
+    computed: {
+      columns() {
+        return [
+          {
+            width: 50,
+            type: 'index',
+            columnKey: 'index',
+            label: '序号',
+            align: 'center'
+          },
+          {
+            prop: 'preType',
+            slot: 'preType',
+            align: 'center',
+            label: '工艺参数'
+          },
+          {
+            prop: 'preType',
+            slot: 'preType',
+            align: 'center',
+            label: '是否请托'
+          },
+          {
+            prop: 'preType',
+            slot: 'preType',
+            align: 'center',
+            label: '检验状态'
+          },
+          {
+            prop: 'preType',
+            slot: 'preType',
+            align: 'center',
+            label: '自检实测结果'
+          },
+          {
+            prop: 'preType',
+            slot: 'preType',
+            align: 'center',
+            label: '自检结果'
+          },
+          {
+            prop: 'preType',
+            slot: 'preType',
+            align: 'center',
+            label: '专检实测结果'
+          },
+          {
+            prop: 'preType',
+            slot: 'preType',
+            align: 'center',
+            label: '专检结果'
+          }
+        ];
+      }
+    },
+
+    methods: {
+      cancel() {
+        this.visible = false;
+      },
+
+      open() {
+        this.visible = true;
+      },
+
+      submitSelf() {},
+
+      saveSelf() {},
+
+      getData() {}
+    }
+  };
+</script>
+
+<style></style>

src/views/produce/components/qualityInspection/components/selfInspectionRequest.vue

@@ -0,0 +1,180 @@
+<template>
+  <ele-modal
+    :before-close="cancel"
+    :close-on-click-modal="false"
+    :maxable="true"
+    title="首件两检项请托"
+    :visible.sync="visible"
+    v-if="visible"
+    append-to-body
+    custom-class="ele-dialog-form"
+    width="60vw"
+  >
+    <el-form
+      ref="form"
+      :model="form"
+      :rules="rules"
+      label-position="right"
+      label-width="110px"
+    >
+      <headerTitle style="margin-top: 15px" title="请托信息" />
+      <el-row :gutter="10" class="basic">
+        <el-col :lg="8" :md="12" :sm="12" :xl="8" :xs="12">
+          <el-form-item label="请托单号：">
+            <el-input v-model="form.order" disabled></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :lg="8" :md="12" :sm="12" :xl="8" :xs="12">
+          <el-form-item label="请托名称：">
+            <el-input v-model="form.order" disabled></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :lg="8" :md="12" :sm="12" :xl="8" :xs="12">
+          <el-form-item label="执行部门：">
+            <el-input v-model="form.order" disabled></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :lg="8" :md="12" :sm="12" :xl="8" :xs="12">
+          <el-form-item label="执行人员：">
+            <el-input v-model="form.order" disabled></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :lg="8" :md="12" :sm="12" :xl="8" :xs="12">
+          <el-form-item label="要求完成日期：">
+            <el-input v-model="form.order" disabled></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :lg="8" :md="12" :sm="12" :xl="8" :xs="12">
+          <el-form-item label="紧急程度：">
+            <el-input v-model="form.order" disabled></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <headerTitle style="margin-top: 15px" title="检查项信息" />
+      <ele-pro-table
+        ref="table"
+        row-key="id"
+        :columns="columns"
+        :datasource="list"
+        cache-key="mes-selfInspectionRequest-20251201"
+        autoAmendPage
+        :need-page="false"
+        @refresh="getData"
+        :selection.sync="selection"
+      >
+      </ele-pro-table>
+    </el-form>
+
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">取 消</el-button>
+      <el-button type="primary" @click="submitSelf">提交</el-button>
+      <el-button type="primary" @click="saveSelf">保存</el-button>
+    </span>
+  </ele-modal>
+</template>
+
+<script>
+  import { listOrganizations, getUserPage } from '@/api/system/organization';
+  export default {
+    data() {
+      return {
+        form: {
+          order: ''
+        },
+        rules: {},
+        visible: false,
+        groupList: [],
+        leaderList: [],
+        list: [],
+        selection: []
+      };
+    },
+
+    computed: {
+      columns() {
+        return [
+          {
+            width: 45,
+            type: 'selection',
+            columnKey: 'selection',
+            align: 'center',
+            fixed: 'left',
+            reserveSelection: true
+          },
+          {
+            width: 50,
+            type: 'index',
+            columnKey: 'index',
+            label: '序号',
+            align: 'center'
+          },
+          {
+            prop: 'preType',
+            slot: 'preType',
+            align: 'center',
+            label: '工艺参数'
+          },
+          {
+            prop: 'preType',
+            slot: 'preType',
+            align: 'center',
+            label: '是否请托'
+          },
+          {
+            prop: 'preType',
+            slot: 'preType',
+            align: 'center',
+            label: '状态'
+          }
+        ];
+      }
+    },
+
+    methods: {
+      open() {
+        this.visible = true;
+        this.getGs();
+      },
+
+      cancel() {
+        this.visible = false;
+      },
+
+      async getGs() {
+        await listOrganizations().then((list) => {
+          this.groupList = this.$util.toTreeData({
+            data: list,
+            idField: 'id',
+            parentIdField: 'parentId'
+          });
+        });
+      },
+
+      async getUserPage() {
+        // if (!this.form.executeGroupId) return (this.leaderList = []);
+        // let par = {
+        //   groupId: this.form.executeGroupId,
+        //   size: 999
+        // };
+        let par = {};
+        await getUserPage(par).then((res) => {
+          this.leaderList = res.list;
+        });
+      },
+
+      getData() {},
+
+      submitSelf() {},
+
+      saveSelf() {}
+    }
+  };
+</script>
+
+<style></style>

src/views/produce/components/qualityInspection/components/specializedInspectionReporting.vue

@@ -0,0 +1,7 @@
+<template> </template>
+
+<script>
+  export default {};
+</script>
+
+<style></style>

src/views/produce/components/qualityInspection/index.vue

@@ -6,9 +6,7 @@
     :before-close="handleClose"
   >
     <div>
-      <!-- <el-button type="primary" plain round @click="openMaintenancePlan">
-        设备保养计划
-      </el-button> -->
+      <el-button type="primary" @click="reportBtn"> 报工 </el-button>
       <div class="step-list" v-loading="loading">
         <ele-pro-table
           ref="table"
@@ -20,25 +18,25 @@
           :need-page="false"
           @refresh="getData"
         >
-          <template v-slot:action="{ row }">
-            <el-button
-              :type="row.executeStatus == 0 ? 'primary' : 'default'"
-              class="status-btn"
-              @click="openMaintenancePlan(row)"
-            >
-              {{ executeStatusTest(row.executeStatus) }}
-            </el-button>
+          <template v-slot:selfCheck="{ row }">
+            <el-button>自检请托</el-button>
+            <el-button>报工</el-button>
+          </template>
+
+          <template v-slot:specialInspection="{ row }">
+            <el-button>报工</el-button>
           </template>
         </ele-pro-table>
       </div>
     </div>
-    <template #footer>
-      <el-button @click="handleUpdate" type="primary" :loading="butLoad"
-        >更新</el-button
-      >
 
-      <el-button @click="handleClose">关闭</el-button>
-    </template>
+    <self-inspection-reporting
+      ref="selfReportingRef"
+    ></self-inspection-reporting>
+    <self-inspection-request ref="selfRequestRef"></self-inspection-request>
+    <specialized-inspection-reporting
+      ref="specializedRef"
+    ></specialized-inspection-reporting>
   </el-dialog>
 </template>
 
@@ -51,10 +49,17 @@
 
   import dictMixins from '@/mixins/dictMixins';
   import tableColumnsMixin from '@/mixins/tableColumnsMixin';
+  import selfInspectionReporting from './components/selfInspectionReporting.vue';
+  import selfInspectionRequest from './components/selfInspectionRequest.vue';
+  import specializedInspectionReporting from './components/specializedInspectionReporting.vue';
 
   export default {
     mixins: [dictMixins, tableColumnsMixin],
-    components: {},
+    components: {
+      selfInspectionReporting,
+      selfInspectionRequest,
+      specializedInspectionReporting
+    },
     data() {
       return {
         dialogVisible: false,
@@ -86,22 +91,35 @@
             }
           },
           {
-            prop: 'executeMethod',
-            label: '执行方式',
+            prop: 'produceTaskName',
+            label: '工位名称',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 150,
+            formatter: (row) => {
+              return row.ruleName || row.itemTaskName || row.planConfigName;
+            }
+          },
+
+          {
+            prop: 'produceTaskName',
+            label: '设备名称',
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 150,
             formatter: (row) => {
-              return this.getDictValue('记录规则执行方式', row.executeMethod);
+              return row.ruleName || row.itemTaskName || row.planConfigName;
             }
           },
+
           {
-            prop: 'reportUserName',
+            prop: 'finishTime',
             label: '报工人',
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 150
           },
+
           {
             prop: 'finishTime',
             label: '报工时间',
@@ -109,26 +127,28 @@
             showOverflowTooltip: true,
             minWidth: 150
           },
+
           {
-            prop: 'duration',
-            label: '工时',
+            prop: 'finishTime',
+            label: '状态',
             align: 'center',
             showOverflowTooltip: true,
-            minWidth: 150,
-            formatter: (row) => {
-              // 毫秒转小时
-              return row.duration
-                ? (row.duration / 1000 / 60 / 60).toFixed(2) + ' 时'
-                : '';
-            }
+            minWidth: 150
+          },
+
+          {
+            label: '自检报工',
+            align: 'center',
+            width: 130,
+            fixed: 'right',
+            slot: 'selfCheck'
           },
-          // 操作
           {
-            label: '操作',
+            label: '专检报工',
             align: 'center',
             width: 130,
             fixed: 'right',
-            slot: 'action'
+            slot: 'specialInspection'
           }
         ];
       }
@@ -172,6 +192,11 @@
         } catch (error) {
           this.butLoad = false;
         }
+      },
+
+      reportBtn() {
+        // this.$refs.selfRequestRef.open();
+        this.$refs.selfReportingRef.open();
       }
     }
   };

src/views/produceOrder/components/releaseDialog/index.vue

@@ -156,11 +156,11 @@
                       :label="1"
                       >工位
                     </el-radio-button>
-                    <el-radio-button
+                    <!-- <el-radio-button
                       :disabled="radioBun(item, 'staffDis')"
                       :label="2"
                       >人员
-                    </el-radio-button>
+                    </el-radio-button> -->
                     <el-radio-button
                       :disabled="radioBun(item, 'lineDis')"
                       :label="3"

src/views/taskList/index.vue

@@ -19,7 +19,7 @@
         <el-tab-pane
           label="NC编程任务"
           name="4"
-          v-if="$hasPermission('mes:taskreport:teamorder')"
+          v-if="$hasPermission('mes:taskreport:programmingorder')"
         ></el-tab-pane>
 
         <!-- <el-tab-pane label="我的任务" name="1"></el-tab-pane>
@@ -27,7 +27,7 @@
       </el-tabs>
       <ele-pro-table
         ref="table"
-        :columns="columns"
+        :columns="tabValue == '4' ? ncColumns : columns"
         :datasource="datasource"
         :pageSize="20"
         cache-key="workOrderTable"
@@ -456,6 +456,247 @@
             slot: 'action'
           }
         ];
+      },
+
+      ncColumns() {
+        return [
+          {
+            columnKey: 'index',
+            label: '序号',
+            type: 'index',
+            width: 55,
+            align: 'center',
+            showOverflowTooltip: true,
+            fixed: 'left'
+          },
+          {
+            slot: 'code',
+            prop: 'code',
+            label: '任务编号',
+            align: 'center',
+            showOverflowTooltip: true,
+            width: 210
+          },
+
+          {
+            prop: 'productionPlanCode',
+            label: '计划编号',
+            align: 'center',
+            showOverflowTooltip: true,
+            width: 170
+          },
+          {
+            prop: 'executeGroupName',
+            label: '执行部门',
+            align: 'center',
+            showOverflowTooltip: true,
+            width: 120
+          },
+          {
+            prop: 'executorName',
+            label: '执行人',
+            align: 'center',
+            showOverflowTooltip: true,
+            width: 180
+          },
+          {
+            prop: 'taskName',
+            label: '工序名称',
+            align: 'center',
+            showOverflowTooltip: true,
+            width: 150
+          },
+          {
+            prop: 'produceRoutingName',
+            label: '工艺路线',
+            align: 'center',
+            showOverflowTooltip: true,
+            width: 170
+          },
+          {
+            prop: 'categoryCode',
+            label: '产品编码',
+            align: 'center',
+            showOverflowTooltip: true,
+            width: 170
+          },
+          {
+            prop: 'categoryName',
+            label: '产品名称',
+            align: 'center',
+            showOverflowTooltip: true,
+            width: 200
+          },
+          {
+            prop: 'productionCodes',
+            label: '生产编号',
+            align: 'center',
+            showOverflowTooltip: true,
+            width: 170
+          },
+          {
+            prop: 'brandNum',
+            label: '牌号',
+            align: 'center',
+            showOverflowTooltip: true,
+            width: 170
+          },
+          {
+            prop: 'batchNo',
+            label: '批次号',
+            align: 'center',
+            width: 100,
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'modelType',
+            label: '型号',
+            align: 'center',
+            width: 200,
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'specification',
+            label: '规格',
+            align: 'center',
+            width: 200,
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'quantity',
+            label: '任务数量',
+            align: 'center',
+            showOverflowTooltip: true,
+            width: 110
+          },
+          {
+            prop: 'weight',
+            label: '任务重量(kg)',
+            align: 'center',
+            showOverflowTooltip: true,
+            width: 110
+          },
+          {
+            prop: 'planStartTime',
+            label: '计划开始时间',
+            align: 'center',
+            showOverflowTooltip: true,
+            width: 180
+          },
+
+          {
+            prop: 'planCompleteTime',
+            label: '计划结束时间',
+            align: 'center',
+            showOverflowTooltip: true,
+            width: 180
+          },
+          {
+            prop: 'startTime',
+            label: '任务开始时间',
+            align: 'center',
+            showOverflowTooltip: true,
+            width: 180
+          },
+
+          {
+            prop: 'endTime',
+            label: '任务结束时间',
+            align: 'center',
+            showOverflowTooltip: true,
+            width: 180
+          },
+          {
+            label: '实际开始时间',
+            prop: 'realStartTime',
+            minWidth: 150,
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            label: '实际结束时间',
+            prop: 'realEndTime',
+            minWidth: 150,
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            label: '工时',
+            prop: 'durationText',
+            width: 150,
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'firstTaskName',
+            label: '首工序',
+            align: 'center',
+            width: 180,
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'createTime',
+            label: '创建时间',
+            align: 'center',
+            showOverflowTooltip: true,
+            width: 180
+          },
+          {
+            prop: 'statusText',
+            label: '状态',
+            align: 'center',
+            // formatter: (row) => {
+            //   const obj = this.statusOpt.find((i) => i.value == row.status);
+            //   return obj && obj.label;
+            // },
+            width: 120
+          },
+          {
+            prop: 'disposalStatus',
+            label: '任务接收状态',
+            align: 'center',
+            slot: 'disposalStatus',
+            width: 120
+          },
+          {
+            prop: 'customerName',
+            label: '客户名称',
+            align: 'center',
+            showOverflowTooltip: true,
+            width: 180
+          },
+          {
+            prop: 'serialNo',
+            label: '客户代号',
+            align: 'center',
+            showOverflowTooltip: true,
+            width: 180
+          },
+
+          {
+            prop: 'simpleName',
+            label: '客户简称',
+            align: 'center',
+            showOverflowTooltip: true,
+            width: 180
+          },
+          {
+            prop: 'remark',
+            label: '备注',
+            align: 'center',
+            showOverflowTooltip: true,
+            width: 180
+          },
+          {
+            columnKey: 'action',
+            label: '操作',
+            width: 200,
+            align: 'center',
+            resizable: false,
+            fixed: 'right',
+            slot: 'action'
+          }
+        ];
       }
     },
     created() {},

vue.config.js

@@ -32,9 +32,9 @@ module.exports = {
       // 当我们的本地的请求 有/api的时候，就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
         // target: 'http://124.71.68.31:50001',
-        target: 'http://192.168.1.125:18086',
-        // target: 'http://192.168.1.251:18086',
+        // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18086',
+        target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.116:18086', // 赵沙金
         // target: 'http://192.168.1.251:18086', // 开发环境