Merge remote-tracking branch 'origin/master'

2 years ago · 20e565e42f
parent 187dfac80f fefc4dae18
commit 20e565e42f
15 changed files with 30 additions and 0 deletions
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@ -200,6 +200,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="160" fixed="right">
          <template slot-scope="scope">
            <el-button type="text" :disabled="scope.row.checkStatus==1 " v-if="showSup" size="small"
--- a/src/views/inout/IoArrivalSearchOrder.vue
+++ b/src/views/inout/IoArrivalSearchOrder.vue
@ -145,6 +145,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="160" fixed="right">
          <template slot-scope="scope">

--- a/src/views/inout/IoAuditedOrder.vue
+++ b/src/views/inout/IoAuditedOrder.vue
@ -114,6 +114,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/IoCheckErrorOrder.vue
+++ b/src/views/inout/IoCheckErrorOrder.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">
          <template slot-scope="scope">
            <el-button
--- a/src/views/inout/IoCheckSuccessOrder.vue
+++ b/src/views/inout/IoCheckSuccessOrder.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="160">
          <template slot-scope="scope">

--- a/src/views/inout/IoCreateBusOrder.vue
+++ b/src/views/inout/IoCreateBusOrder.vue
@ -139,6 +139,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
@ -137,6 +137,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/IoCreateOrder.vue
+++ b/src/views/inout/IoCreateOrder.vue
@ -137,6 +137,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
@ -130,6 +130,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
@ -137,6 +137,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/IoDeliveryAuditOrder.vue
+++ b/src/views/inout/IoDeliveryAuditOrder.vue
@ -198,6 +198,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="250" fixed="right">
          <template slot-scope="scope">

--- a/src/views/inout/IoDeliverySearchOrder.vue
+++ b/src/views/inout/IoDeliverySearchOrder.vue
@ -217,6 +217,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="160" fixed="right">
          <template slot-scope="scope">

--- a/src/views/inout/IoSupAduitOrder.vue
+++ b/src/views/inout/IoSupAduitOrder.vue
@ -129,6 +129,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="140" fixed="right">
          <template slot-scope="scope">
            <el-button
--- a/src/views/inout/IoSupSearchOrder.vue
+++ b/src/views/inout/IoSupSearchOrder.vue
@ -164,6 +164,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="验收状态" prop="status" width="100">-->
        <!--          <template slot-scope="scope">-->
        <!--            <el-tag :type="statusFilterType(scope.row.status)">{{-->
--- a/src/views/inout/IoSupSecAuditOrder.vue
+++ b/src/views/inout/IoSupSecAuditOrder.vue
@ -148,6 +148,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="验收状态" prop="status" width="100">-->
        <!--          <template slot-scope="scope">-->
        <!--            <el-tag :type="statusFilterType(scope.row.status)">{{-->