Merge branch 'live' into edit

src/components/ex-table/main.vue

@@ -42,7 +42,6 @@
       v-on="$listeners"
       @selection-change="tableSelection = $event"
       :span-method="arraySpanMethod"
-      @row-click="RowClick"
       style="width: 100%"
     >
       <template v-for="(column, index) in columns">
@@ -337,9 +336,6 @@ export default {
         }
       }
     },
-    RowClick(e) {
-      this.$emit("RowClick", e);
-    },
     //行拖拽
     rowDrop() {
       const tbody = document.querySelector(

src/views/sellOut/consultOrder/index.vue

@@ -30,10 +30,10 @@
                 <el-col :span="4" style="width: 120px">
                   <el-select
                     :size="searchSize"
-                    v-model="parmValue.status"
+                    v-model="parmValue.zxtype"
                     filterable
                     clearable
-                    placeholder="账号状态"
+                    placeholder="咨询类型"
                     style="width: 100%"
                     @change="
                       pageInfo.curr = 1;
@@ -43,9 +43,9 @@
                   >
                     <el-option
                       v-for="item in statusList"
-                      :key="'status' + item.code"
-                      :label="item.name"
-                      :value="item.code"
+                      :key="'zxtype' + item"
+                      :label="iteme"
+                      :value="item"
                     />
                   </el-select>
                 </el-col>

src/views/stock/check/index.vue

@@ -12,7 +12,6 @@
         :size="size"
         @page-curr-change="handlePageChange"
         @page-size-change="handleSizeChange"
-        @RowClick="RowClick"
         @screen-reset="
           pageInfo.curr = 1;
           parmValue.page = 1;
@@ -118,7 +117,11 @@
                     type="primary"
                     class="fr"
                     icon="el-icon-search"
-                    @click="searchList"
+                    @click="
+                      pageInfo.curr = 1;
+                      parmValue.page = 1;
+                      searchList();
+                    "
                 /></el-col>
                 <el-col :span="4" style="width: 66px">
                   <el-button
@@ -158,6 +161,29 @@
             "
           ></el-tag>
         </template>
+        <template #type="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            :type="scope.row.type == '1' ? 'success' : ''"
+            v-text="
+              (typeOptions.find((item) => item.id == scope.row.type) || {})
+                .label || '--'
+            "
+          ></el-tag>
+        </template>
+        <template #operation="{ scope }">
+          <el-tooltip
+            v-if="powers.some((item) => item == '007')"
+            effect="dark"
+            content="详情"
+            placement="top"
+          >
+            <i
+              class="el-icon-view tb-icon"
+              @click="gotoDetail(scope.row.id)"
+            ></i>
+          </el-tooltip>
+        </template>
       </ex-table>
       <add-model
         :id="modelId"
@@ -223,7 +249,7 @@ export default {
       parmValue: {
         page: 1, // 页码
         size: 15, // 每页显示条数
-        wsm_code: "", // 盘点仓库 
+        wsm_code: "", // 盘点仓库
         check_code: "", // 	盘点编号
         type: "", //盘点类型
         status: "", //判断状态
@@ -253,7 +279,9 @@ export default {
         {
           prop: "check_code",
           label: "盘点编号",
+          width: "155px",
         },
+
         {
           prop: "wsm_code",
           label: "仓库编码",
@@ -263,6 +291,7 @@ export default {
           prop: "name",
           label: "仓库名称",
         },
+
         {
           prop: "code",
           label: "公司编码",
@@ -272,18 +301,32 @@ export default {
           prop: "caname",
           label: "公司名称",
         },
+        {
+          prop: "status",
+          label: "盘点状态",
+          _slot_: "status",
+          width: "120px",
+        },
 
-        // {
-        //   prop: "status",
-        //   label: "状态",
-        //   _slot_: "status",
-        //   width: "80px",
-        // },
+        {
+          prop: "type",
+          label: "盘点类型",
+          _slot_: "type",
+          width: "70px",
+        },
         {
           prop: "addtime",
           label: "创建时间",
           width: "140px",
         },
+        {
+          prop: "",
+          label: "操作",
+          fixed: "right",
+          _noset_: true,
+          width: "50px",
+          _slot_: "operation",
+        },
       ],
     };
   },
@@ -351,7 +394,7 @@ export default {
       }
       this.loading = false;
     },
-    async RowClick(e) {
+    async gotoDetail(id) {
       let path = "checkDetail";
       let index = this.visitedViews.findIndex((v) => v.name === path);
       if (index !== -1) {
@@ -364,18 +407,18 @@ export default {
             this.$store
               .dispatch("tagsView/delView", this.visitedViews[index])
               .then(() => {
-                this.gotoDetail(path, e.id);
+                this.gotoDetailRouter(path, id);
               });
           })
           .catch(() => {
             console.log("取消");
           });
       } else {
-        this.gotoDetail(path, e.id);
+        this.gotoDetailRouter(path, id);
       }
     },
 
-    gotoDetail(path, id) {
+    gotoDetailRouter(path, id) {
       window.vm.$router.push({
         path: path,
         query: {