Merge remote-tracking branch 'origin/master'

2 years ago · a943125672
parent 5b3f089402 210793bcb7
commit a943125672
16 changed files with 31 additions and 2 deletions
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@ -441,8 +441,6 @@ export default {
    };
    this.inputQuery = {
      userName: this.$store.getters.name,
-
-      // locInvCode: store.getters.locInvCode,
    };
    this.getInputQuery();
    this.getDeptList();
--- a/src/views/inout/DialogCreateOrderSelect.vue
+++ b/src/views/inout/DialogCreateOrderSelect.vue
@ -141,6 +141,8 @@
            <span>{{ scope.row.createTime }}</span>
          </template>
        </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
        <!--        <el-table-column label="校验状态" prop="status" width="100">-->
        <!--          <template slot-scope="scope">-->
        <!--            <el-tag :type="(scope.row.status ===-1 ) | statusFilterType">{{-->
--- a/src/views/inout/IoAuditedOrder.vue
+++ b/src/views/inout/IoAuditedOrder.vue
@ -153,6 +153,8 @@
            </el-tag>
          </template>
        </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
        <el-table-column label="操作" width="200" fixed="right">
          <template slot-scope="scope">
            <el-button
--- a/src/views/inout/IoCheckAuditBusOrder.vue
+++ b/src/views/inout/IoCheckAuditBusOrder.vue
@ -122,6 +122,8 @@
            </el-tag>
          </template>
        </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
        <el-table-column label="操作" width="150" fixed="right">
          <template slot-scope="scope">
            <el-button
--- a/src/views/inout/IoCheckAuditNewOrder.vue
+++ b/src/views/inout/IoCheckAuditNewOrder.vue
@ -120,6 +120,8 @@
            </el-tag>
          </template>
        </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
        <el-table-column label="操作" width="150" fixed="right">
          <template slot-scope="scope">
            <el-button
--- a/src/views/inout/IoCheckAuditOrder.vue
+++ b/src/views/inout/IoCheckAuditOrder.vue
@ -138,6 +138,8 @@
            </el-tag>
          </template>
        </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
        <el-table-column label="操作" width="220" fixed="right">
          <template slot-scope="scope">

--- a/src/views/inout/IoCheckErrorOrder.vue
+++ b/src/views/inout/IoCheckErrorOrder.vue
@ -141,6 +141,8 @@
            </el-tag>
          </template>
        </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
        <el-table-column label="操作" width="150">
          <template slot-scope="scope">
            <el-button
--- a/src/views/inout/IoCheckSuccessOrder.vue
+++ b/src/views/inout/IoCheckSuccessOrder.vue
@ -120,6 +120,8 @@
            </el-tag>
          </template>
        </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
        <el-table-column label="操作" width="200" fixed="right">
          <template slot-scope="scope">
            <el-button
--- a/src/views/inout/IoCreateBusOrder.vue
+++ b/src/views/inout/IoCreateBusOrder.vue
@ -150,6 +150,8 @@
            </el-tag>
          </template>
        </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
        <el-table-column label="操作" width="150" fixed="right">
          <template slot-scope="scope">
            <el-button
--- a/src/views/inout/IoCreateErrorOrder.vue
+++ b/src/views/inout/IoCreateErrorOrder.vue
@ -135,6 +135,8 @@
            </el-tag>
          </template>
        </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
        <el-table-column label="操作" width="150" fixed="right">
          <template slot-scope="scope">
            <el-button
--- a/src/views/inout/IoCreateOrder.vue
+++ b/src/views/inout/IoCreateOrder.vue
@ -170,6 +170,8 @@
            </el-tag>
          </template>
        </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
        <el-table-column label="操作" width="150" fixed="right">
          <template slot-scope="scope">
            <el-button
--- a/src/views/inout/IoCreateScanOrder.vue
+++ b/src/views/inout/IoCreateScanOrder.vue
@ -138,6 +138,8 @@
            </el-tag>
          </template>
        </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
        <el-table-column label="操作" width="150" fixed="right">

          <template slot-scope="scope">
--- a/src/views/inout/IoDealOrder.vue
+++ b/src/views/inout/IoDealOrder.vue
@ -149,6 +149,8 @@
            </el-tag>
          </template>
        </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
        <el-table-column label="操作" width="150" fixed="right">
          <template slot-scope="scope">
            <el-button
--- a/src/views/inout/IoEditOrder.vue
+++ b/src/views/inout/IoEditOrder.vue
@ -45,6 +45,8 @@
            </el-tag>
          </template>
        </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
        <el-table-column label="操作" fixed="right" width="150">
          <template slot-scope="scope">
            <el-button
--- a/src/views/inout/IoWaitAllocateOrder.vue
+++ b/src/views/inout/IoWaitAllocateOrder.vue
@ -149,6 +149,8 @@
            </el-tag>
          </template>
        </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
        <el-table-column label="操作" width="150" fixed="right">
          <template slot-scope="scope">
            <el-button
@ -283,6 +285,7 @@
            prop="certCode"
            show-overflow-tooltip
          ></el-table-column>
+
        </el-table>
      </el-tab-pane>
    </el-tabs>
--- a/src/views/purchase/purApply/pureApplyAudit.vue
+++ b/src/views/purchase/purApply/pureApplyAudit.vue
@ -103,6 +103,8 @@
        </el-table-column>
        <el-table-column label="创建时间" prop="createTime"
                         sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
        <el-table-column label="操作" width="60px">
          <template slot-scope="scope">
            <el-button type="text" :disabled="scope.row.status!=2"