1

src/views/activity/couponInfo/index.vue

@@ -11,22 +11,6 @@
             <el-col :span="1.5">
                 <el-button type="primary" plain icon="el-icon-plus" @click="handleAdd" v-hasPermi="['activity:couponInfo:add']">新增</el-button>
             </el-col>
-            <el-col :span="1.5">
-                <el-button type="success" plain icon="el-icon-edit" :disabled="single" @click="handleUpdate" v-hasPermi="['activity:couponInfo:edit']">修改</el-button>
-            </el-col>
-            <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['activity:couponInfo:remove']">删除</el-button>
-            </el-col>
-            <!--      <el-col :span="1.5">-->
-            <!--        <el-button-->
-            <!--          type="warning"-->
-            <!--          plain-->
-            <!--          icon="el-icon-download"-->
-            <!--           -->
-            <!--          @click="handleExport"-->
-            <!--          v-hasPermi="['activity:couponInfo:export']"-->
-            <!--        >导出</el-button>-->
-            <!--      </el-col>-->
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
@@ -91,7 +75,7 @@
         </Page>
 
         <!-- 添加或修改送券活动对话框 -->
-        <el-dialog :title="title" :visible.sync="open" size="70%" append-to-body>
+        <el-dialog :title="title" :visible.sync="open" size="80%" append-to-body>
             <el-row :gutter="15">
                 <el-form ref="form" :model="form" :rules="rules" label-width="180px" size="small">
                     <el-col :span="24">

src/views/cloth/hanger/upHanger.vue

@@ -6,10 +6,10 @@
                     <el-row :gutter="10">
                         <el-col :span="24">
                             <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-                                <el-form-item label="衣物条码" prop="washCode">
+                                <el-form-item  prop="washCode">
                                     <el-input v-model="queryParams.washCode" placeholder="请输入衣物条码" clearable @keyup.enter.native="handleQuery" />
                                 </el-form-item>
-                                <el-form-item label="洗衣单号" prop="orderNo">
+                                <el-form-item prop="orderNo">
                                     <el-input v-model="queryParams.orderNo" placeholder="请输入洗衣单号" clearable @keyup.enter.native="handleQuery" />
                                 </el-form-item>
                                 <el-form-item label="状态" prop="flowStatus">

src/views/cloth/inquiry/queryEntryRecord.vue

@@ -1,55 +1,54 @@
 <template>
-    <div class="app-container">
-        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item label="衣服条码" prop="washCode">
-                <el-input v-model="queryParams.washCode" placeholder="请输入衣服条码" clearable @keyup.enter.native="handleQuery" />
-            </el-form-item>
-            <el-form-item label="入厂时间" prop="dateRange">
-                <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-            </el-form-item>
-            <el-form-item label="门店" prop="orgId">
-                <el-select v-model="queryParams.orgId" style="width: 200px" placeholder="请选择门店" clearable>
-                    <el-option v-for="item in storelist" :key="item.id" :label="item.name" :value="item.id" />
-                </el-select>
-            </el-form-item>
-            <el-form-item>
-                <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-                <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-            </el-form-item>
-        </el-form>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item prop="washCode">
+        <el-input v-model="queryParams.washCode" placeholder="请输入衣服条码" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item prop="dateRange">
+        <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
+      <el-form-item prop="orgId">
+        <el-select v-model="queryParams.orgId" style="width: 200px" placeholder="请选择门店" clearable>
+          <el-option v-for="item in storelist" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
 
-        <el-row :gutter="10" class="mb8">
-            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
 
-        <el-table v-loading="loading" fit highlight-current-row border stripe :data="recordsList">
-            <el-table-column label="衣物条码" align="center" prop="washCode" />
-            <el-table-column label="所属门店" align="center" prop="orgName">
-                <template slot-scope="scope">
-                    {{ scope.row.orgName ? scope.row.orgName : '--' }}
-                </template>
-            </el-table-column>
-            <el-table-column label="衣物名称" align="center" prop="clothItemName" />
-            <el-table-column label="颜色" align="center" prop="clothColorName">
-                <template slot-scope="scope">
-                    {{ getColor(scope.row.orderClothColors) }}
-                </template>
-            </el-table-column>
-            <el-table-column label="加急" align="center" prop="clothSpeedName" />
-            <el-table-column label="状态" align="center" prop="flowStatus">
-                <template slot-scope="scope">
-                    <dict-tag :options="dict.type.order_cloth_flow_status" :value="scope.row.flowStatus" />
-                </template>
-            </el-table-column>
-            <el-table-column label="取衣时间" align="center" prop="takeClothTime">
-                <template slot-scope="scope">
-                    {{ scope.row.takeClothTime ? scope.row.takeClothTime : '--' }}
-                </template>
-            </el-table-column>
-        </el-table>
-
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
-    </div>
+    <Page uri="/mapi/order/clothItem/findFactoryClothPage" :request-params="queryParams" ref="pagination">
+      <el-table-column label="衣物条码" align="center" prop="washCode" />
+      <el-table-column label="所属门店" align="center" prop="orgName">
+        <template slot-scope="scope">
+          {{ scope.row.orgName ? scope.row.orgName : '--' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="衣物名称" align="center" prop="clothItemName" />
+      <el-table-column label="颜色" align="center" prop="clothColorName">
+        <template slot-scope="scope">
+          {{ getColor(scope.row.orderClothColors) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="加急" align="center" prop="clothSpeedName" />
+      <el-table-column label="状态" align="center" prop="flowStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.order_cloth_flow_status" :value="scope.row.flowStatus" />
+        </template>
+      </el-table-column>
+      <el-table-column label="取衣时间" align="center" prop="takeClothTime">
+        <template slot-scope="scope">
+          {{ scope.row.takeClothTime ? scope.row.takeClothTime : '--' }}
+        </template>
+      </el-table-column>
+    </Page>
+  </div>
 </template>
 
 <script>
@@ -57,89 +56,86 @@ import { listfindFactoryClothPage } from '@/api/system/inquiry'
 import { allOrg } from '@/api/system/store'
 
 export default {
-    name: 'queryEntryRecord',
-    dicts: ['order_cloth_flow_status'],
-    data() {
-        return {
-            // 遮罩层
-            loading: true,
-            // 显示搜索条件
-            showSearch: true,
-            // 总条数
-            total: 0,
-            // 表格数据
-            recordsList: [],
-            // 查询参数
-            queryParams: {
-                pageNum: 1,
-                pageSize: 10,
-                washCode: undefined,
-                orgId: undefined,
-                beginInFactoryTime: undefined,
-                endInFactoryTime: undefined,
-                flowStatus: 1
-            },
-            dateRange: '',
-            //门店下拉数据
-            storelist: []
-        }
-    },
-    created() {
-        this.getList()
-        this.getStoreList()
-    },
-    computed: {},
-    methods: {
-        /** 查询公告列表 */
-        getList() {
-            this.loading = true
+  name: 'queryEntryRecord',
+  dicts: ['order_cloth_flow_status'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 表格数据
+      recordsList: [],
+      // 查询参数
+      queryParams: {
+        washCode: undefined,
+        orgId: undefined,
+        beginInFactoryTime: undefined,
+        endInFactoryTime: undefined,
+        flowStatus: 1
+      },
+      dateRange: '',
+      //门店下拉数据
+      storelist: []
+    }
+  },
+  created() {
+    this.getList()
+    this.getStoreList()
+  },
+  computed: {},
+  methods: {
+    /** 查询公告列表 */
+    getList() {
+      this.loading = true
 
-            if (this.dateRange.length) {
-                this.queryParams.beginInFactoryTime = this.dateRange[0]
-                this.queryParams.endInFactoryTime = this.dateRange[1]
-            }
-            // this.addDateRange(this.queryParams, this.dateRange)
+      if (this.dateRange.length) {
+        this.queryParams.beginInFactoryTime = this.dateRange[0]
+        this.queryParams.endInFactoryTime = this.dateRange[1]
+      }
+      if (this.queryParams.orgId) {
+        const obj = this.storelist.find((item) => item.id === this.queryParams.orgId)
+        this.queryParams.sourceType = obj.sourceType
+      }
+      this.$nextTick(() => {
+        this.$refs.pagination.handleSearch(true)
+      })
 
-            if (this.queryParams.orgId) {
-                const obj = this.storelist.find((item) => item.id === this.queryParams.orgId)
-                this.queryParams.sourceType = obj.sourceType
-            }
-            listfindFactoryClothPage(this.queryParams).then((response) => {
-                console.log(response)
-                this.recordsList = response.data.records
-                this.total = response.data.total
-                this.loading = false
-            })
-        },
-        /** 获取门店下拉数据 */
-        getStoreList() {
-            allOrg({
-                sourceType: '02'
-            }).then((response) => {
-                console.log(response)
-                this.storelist = response.data
-            })
-        },
-        /** 搜索按钮操作 */
-        handleQuery() {
-            this.queryParams.pageNum = 1
-            this.getList()
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-            this.resetForm('queryForm')
-            this.dateRange = ''
-            this.handleQuery()
-        },
-        //获取颜色
-        getColor(data) {
-            const _color = []
-            data.forEach((item) => {
-                _color.push(item.clothColorName)
-            })
-            return _color.join(',')
-        }
+    },
+    /** 获取门店下拉数据 */
+    getStoreList() {
+      allOrg({
+        sourceType: '02'
+      }).then((response) => {
+        console.log(response)
+        this.storelist = response.data
+      })
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.dateRange = ''
+      this.handleQuery()
+    },
+    //获取颜色
+    getColor(data) {
+      if (data && data != null) {
+        const _color = []
+        data.forEach((item) => {
+          _color.push(item.clothColorName)
+        })
+        return _color.join(',')
+      } else {
+        return '--'
+      }
     }
+  }
 }
 </script>
 <style></style>

src/views/cloth/inquiry/queryFactoryClothing.vue

@@ -1,52 +1,51 @@
 <template>
-    <div class="app-container">
-        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item label="衣服条码" prop="washCode">
-                <el-input v-model="queryParams.washCode" placeholder="请输入衣服条码" clearable @keyup.enter.native="handleQuery" />
-            </el-form-item>
-            <el-form-item label="门店" prop="orgId">
-                <el-select v-model="queryParams.orgId" placeholder="请选择门店" clearable>
-                    <el-option v-for="item in storelist" :key="item.id" :label="item.name" :value="item.id" />
-                </el-select>
-            </el-form-item>
-            <el-form-item>
-                <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-                <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-            </el-form-item>
-        </el-form>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item prop="washCode">
+        <el-input v-model="queryParams.washCode" placeholder="请输入衣服条码" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item prop="orgId">
+        <el-select v-model="queryParams.orgId" placeholder="请选择门店" clearable>
+          <el-option v-for="item in storelist" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
 
-        <el-row :gutter="10" class="mb8">
-            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
 
-        <el-table v-loading="loading" fit highlight-current-row border stripe :data="clothingList">
-            <el-table-column label="衣物条码" align="center" prop="washCode" />
-            <el-table-column label="所属门店" align="center" prop="orgName">
-                <template slot-scope="scope">
-                    {{ scope.row.orgName ? scope.row.orgName : '--' }}
-                </template>
-            </el-table-column>
-            <el-table-column label="衣物名称" align="center" prop="clothItemName" />
-            <el-table-column label="颜色" align="center" prop="clothColorName">
-                <template slot-scope="scope">
-                    {{ getColor(scope.row.orderClothColors) }}
-                </template>
-            </el-table-column>
-            <el-table-column label="加急" align="center" prop="clothSpeedName" />
-            <el-table-column label="状态" align="center" prop="flowStatus">
-                <template slot-scope="scope">
-                    <dict-tag :options="dict.type.order_cloth_flow_status" :value="scope.row.flowStatus" />
-                </template>
-            </el-table-column>
-            <el-table-column label="取衣时间" align="center" prop="takeClothTime">
-                <template slot-scope="scope">
-                    {{ scope.row.takeClothTime ? scope.row.takeClothTime : '--' }}
-                </template>
-            </el-table-column>
-        </el-table>
+    <Page uri="/mapi/order/clothItem/findFactoryClothPage" :request-params="queryParams" ref="pagination">
+      <el-table-column label="衣物条码" align="center" prop="washCode" />
+      <el-table-column label="所属门店" align="center" prop="orgName">
+        <template slot-scope="scope">
+          {{ scope.row.orgName ? scope.row.orgName : '--' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="衣物名称" align="center" prop="clothItemName" />
+      <el-table-column label="颜色" align="center" prop="clothColorName">
+        <template slot-scope="scope">
+          {{ getColor(scope.row.orderClothColors) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="加急" align="center" prop="clothSpeedName" />
+      <el-table-column label="状态" align="center" prop="flowStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.order_cloth_flow_status" :value="scope.row.flowStatus" />
+        </template>
+      </el-table-column>
+      <el-table-column label="取衣时间" align="center" prop="takeClothTime">
+        <template slot-scope="scope">
+          {{ scope.row.takeClothTime ? scope.row.takeClothTime : '--' }}
+        </template>
+      </el-table-column>
+    </Page>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
-    </div>
+  </div>
 </template>
 
 <script>
@@ -54,77 +53,75 @@ import { listfindFactoryClothPage } from '@/api/system/inquiry'
 import { allOrg } from '@/api/system/store'
 
 export default {
-    name: 'queryFactoryClothing',
-    dicts: ['order_cloth_flow_status'],
-    data() {
-        return {
-            // 遮罩层
-            loading: true,
-            // 显示搜索条件
-            showSearch: true,
-            // 总条数
-            total: 0,
-            // 表格数据
-            clothingList: [],
-            // 查询参数
-            queryParams: {
-                pageNum: 1,
-                pageSize: 10,
-                washCode: undefined,
-                orgId: undefined
-            },
-            //门店下拉数据
-            storelist: []
-        }
+  name: 'queryFactoryClothing',
+  dicts: ['order_cloth_flow_status'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 表格数据
+      clothingList: [],
+      // 查询参数
+      queryParams: {
+        washCode: undefined,
+        orgId: undefined
+      },
+      //门店下拉数据
+      storelist: []
+    }
+  },
+  created() {
+    this.getList()
+    this.getStoreList()
+  },
+  computed: {},
+  methods: {
+    /** 查询公告列表 */
+    getList() {
+      this.loading = true
+      if (this.queryParams.orgId) {
+        const obj = this.storelist.find((item) => item.id === this.queryParams.orgId)
+        this.queryParams.sourceType = obj.sourceType
+      }
+      this.$nextTick(() => {
+        this.$refs.pagination.handleSearch(true)
+      })
+    },
+    /** 获取门店下拉数据 */
+    getStoreList() {
+      allOrg({
+        sourceType: '02'
+      }).then((response) => {
+        console.log(response)
+        this.storelist = response.data
+      })
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList()
     },
-    created() {
-        this.getList()
-        this.getStoreList()
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.handleQuery()
     },
-    computed: {},
-    methods: {
-        /** 查询公告列表 */
-        getList() {
-            this.loading = true
-            if (this.queryParams.orgId) {
-                const obj = this.storelist.find((item) => item.id === this.queryParams.orgId)
-                this.queryParams.sourceType = obj.sourceType
-            }
-            listfindFactoryClothPage(this.queryParams).then((response) => {
-                console.log(response)
-                this.clothingList = response.data.records
-                this.total = response.data.total
-                this.loading = false
-            })
-        },
-        /** 获取门店下拉数据 */
-        getStoreList() {
-            allOrg({
-                sourceType: '02'
-            }).then((response) => {
-                console.log(response)
-                this.storelist = response.data
-            })
-        },
-        /** 搜索按钮操作 */
-        handleQuery() {
-            this.queryParams.pageNum = 1
-            this.getList()
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-            this.resetForm('queryForm')
-            this.handleQuery()
-        },
-        //获取颜色
-        getColor(data) {
-            const _color = []
-            data.forEach((item) => {
-                _color.push(item.clothColorName)
-            })
-            return _color.join(',')
-        }
+    //获取颜色
+    getColor(data) {
+      if (data && data != null) {
+        const _color = []
+        data.forEach((item) => {
+          _color.push(item.clothColorName)
+        })
+        return _color.join(',')
+      } else {
+        return '--'
+      }
     }
+  }
 }
 </script>
 <style></style>

src/views/cloth/inquiry/queryFactoryRecords.vue

@@ -1,51 +1,51 @@
 <template>
-    <div class="app-container">
-        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item label="衣服条码" prop="washCode">
-                <el-input v-model="queryParams.washCode" placeholder="请输入衣服条码" clearable @keyup.enter.native="handleQuery" />
-            </el-form-item>
-            <el-form-item label="出厂时间" prop="dateRange">
-                <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-            </el-form-item>
-            <el-form-item label="门店" prop="orgId">
-                <el-select v-model="queryParams.orgId" style="width: 200px" placeholder="请选择门店" clearable>
-                    <el-option v-for="item in storelist" :key="item.id" :label="item.name" :value="item.id" />
-                </el-select>
-            </el-form-item>
-            <el-form-item label="提交人" prop="outFactoryById">
-                <el-select v-model="queryParams.outFactoryById" style="width: 200px" placeholder="请选择提交人" clearable>
-                    <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
-                </el-select>
-            </el-form-item>
-            <el-form-item>
-                <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-                <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-            </el-form-item>
-        </el-form>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item prop="washCode">
+        <el-input v-model="queryParams.washCode" placeholder="请输入衣服条码" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item prop="dateRange">
+        <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
+      <el-form-item prop="orgId">
+        <el-select v-model="queryParams.orgId" style="width: 200px" placeholder="请选择门店" clearable>
+          <el-option v-for="item in storelist" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="outFactoryById">
+        <el-select v-model="queryParams.outFactoryById" style="width: 200px" placeholder="请选择提交人" clearable>
+          <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
 
-        <el-row :gutter="10" class="mb8">
-            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
 
-        <el-table v-loading="loading" fit highlight-current-row border stripe :data="recordsList">
-            <el-table-column label="衣物条码" align="center" prop="washCode" />
-            <el-table-column label="所属门店" align="center" prop="orgName">
-                <template slot-scope="scope">
-                    {{ scope.row.orgName ? scope.row.orgName : '--' }}
-                </template>
-            </el-table-column>
-            <el-table-column label="出厂时间" align="center" prop="outFactoryTime"> </el-table-column>
-            <el-table-column label="加急" align="center" prop="clothSpeedName" />
-            <el-table-column label="提交人" align="center" prop="outFactoryBy"> </el-table-column>
-            <el-table-column label="状态" align="center" prop="flowStatus">
-                <template slot-scope="scope">
-                    <dict-tag :options="dict.type.order_cloth_flow_status" :value="scope.row.flowStatus" />
-                </template>
-            </el-table-column>
-        </el-table>
+    <Page uri="/mapi/order/clothItem/findFactoryClothPage" :request-params="queryParams" ref="pagination">
+      <el-table-column label="衣物条码" align="center" prop="washCode" />
+      <el-table-column label="所属门店" align="center" prop="orgName">
+        <template slot-scope="scope">
+          {{ scope.row.orgName ? scope.row.orgName : '--' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="出厂时间" align="center" prop="outFactoryTime"> </el-table-column>
+      <el-table-column label="加急" align="center" prop="clothSpeedName" />
+      <el-table-column label="提交人" align="center" prop="outFactoryBy"> </el-table-column>
+      <el-table-column label="状态" align="center" prop="flowStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.order_cloth_flow_status" :value="scope.row.flowStatus" />
+        </template>
+      </el-table-column>
+    </Page>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
-    </div>
+  </div>
 </template>
 
 <script>
@@ -54,97 +54,96 @@ import { allOrg } from '@/api/system/store'
 import { AllUser } from '@/api/system/user'
 
 export default {
-    name: 'queryFactoryRecords',
-    dicts: ['order_cloth_flow_status'],
-    data() {
-        return {
-            // 遮罩层
-            loading: true,
-            // 显示搜索条件
-            showSearch: true,
-            // 总条数
-            total: 0,
-            // 表格数据
-            recordsList: [],
-            // 查询参数
-            queryParams: {
-                pageNum: 1,
-                pageSize: 10,
-                washCode: undefined,
-                orgId: undefined,
-                outFactoryById: undefined,
-                beginOutFactoryTime: undefined,
-                endOutFactoryTime: undefined,
-                flowStatus: 3
-            },
-            dateRange: '',
-            //门店下拉数据
-            storelist: [],
-            //提交人数据
-            userList: []
-        }
-    },
-    created() {
-        this.getList()
-        this.getStoreList()
-        this.getuserList()
-    },
-    computed: {},
-    methods: {
-        /** 查询公告列表 */
-        getList() {
-            this.loading = true
+  name: 'queryFactoryRecords',
+  dicts: ['order_cloth_flow_status'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 表格数据
+      recordsList: [],
+      // 查询参数
+      queryParams: {
+        washCode: undefined,
+        orgId: undefined,
+        outFactoryById: undefined,
+        beginOutFactoryTime: undefined,
+        endOutFactoryTime: undefined,
+        flowStatus: 3
+      },
+      dateRange: '',
+      //门店下拉数据
+      storelist: [],
+      //提交人数据
+      userList: []
+    }
+  },
+  created() {
+    this.getList()
+    this.getStoreList()
+    this.getuserList()
+  },
+  computed: {},
+  methods: {
+    /** 查询公告列表 */
+    getList() {
+      this.loading = true
 
-            if (this.dateRange.length) {
-                this.queryParams.beginOutFactoryTime = this.dateRange[0]
-                this.queryParams.endOutFactoryTime = this.dateRange[1]
-            }
-            // this.addDateRange(this.queryParams, this.dateRange)
+      if (this.dateRange.length) {
+        this.queryParams.beginOutFactoryTime = this.dateRange[0]
+        this.queryParams.endOutFactoryTime = this.dateRange[1]
+      }
+      // this.addDateRange(this.queryParams, this.dateRange)
 
-            if (this.queryParams.orgId) {
-                const obj = this.storelist.find((item) => item.id === this.queryParams.orgId)
-                this.queryParams.sourceType = obj.sourceType
-            }
-            listfindFactoryClothPage(this.queryParams).then((response) => {
-                this.recordsList = response.data.records
-                this.total = response.data.total
-                this.loading = false
-            })
-        },
-        /** 获取门店下拉数据 */
-        getStoreList() {
-            allOrg({
-                sourceType: '02'
-            }).then((response) => {
-                this.storelist = response.data
-            })
-        },
-        // 获取提交人数据
-        getuserList() {
-            AllUser({}).then((response) => {
-                this.userList = response.data
-            })
-        },
-        /** 搜索按钮操作 */
-        handleQuery() {
-            this.queryParams.pageNum = 1
-            this.getList()
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-            this.resetForm('queryForm')
-            this.dateRange = ''
-            this.handleQuery()
-        },
-        //获取颜色
-        getColor(data) {
-            const _color = []
-            data.forEach((item) => {
-                _color.push(item.clothColorName)
-            })
-            return _color.join(',')
-        }
+      if (this.queryParams.orgId) {
+        const obj = this.storelist.find((item) => item.id === this.queryParams.orgId)
+        this.queryParams.sourceType = obj.sourceType
+      }
+      this.$nextTick(() => {
+        this.$refs.pagination.handleSearch(true)
+      })
+    },
+    /** 获取门店下拉数据 */
+    getStoreList() {
+      allOrg({
+        sourceType: '02'
+      }).then((response) => {
+        this.storelist = response.data
+      })
+    },
+    // 获取提交人数据
+    getuserList() {
+      AllUser({}).then((response) => {
+        this.userList = response.data
+      })
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.dateRange = ''
+      this.handleQuery()
+    },
+    //获取颜色
+    getColor(data) {
+      if (data && data != null) {
+        const _color = []
+        data.forEach((item) => {
+          _color.push(item.clothColorName)
+        })
+        return _color.join(',')
+      } else {
+        return '--'
+      }
     }
+  }
 }
 </script>
 <style></style>

src/views/cloth/inquiry/queryInspectRecords.vue

@@ -1,60 +1,60 @@
 <template>
-    <div class="app-container">
-        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item label="衣服条码" prop="washCode">
-                <el-input v-model="queryParams.washCode" placeholder="请输入衣服条码" clearable @keyup.enter.native="handleQuery" />
-            </el-form-item>
-            <el-form-item label="记录时间" prop="dateRange">
-                <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-            </el-form-item>
-            <el-form-item label="门店" prop="orgId">
-                <el-select v-model="queryParams.orgId" placeholder="请选择门店" style="width: 200px" clearable>
-                    <el-option v-for="item in storelist" :key="item.id" :label="item.name" :value="item.id" />
-                </el-select>
-            </el-form-item>
-            <el-form-item label="检查人" prop="checkClothById">
-                <el-select v-model="queryParams.checkClothById" style="width: 200px" placeholder="请选择提交人" clearable>
-                    <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
-                </el-select>
-            </el-form-item>
-            <el-form-item>
-                <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-                <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-            </el-form-item>
-        </el-form>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item prop="washCode">
+        <el-input v-model="queryParams.washCode" placeholder="请输入衣服条码" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item prop="dateRange">
+        <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
+      <el-form-item prop="orgId">
+        <el-select v-model="queryParams.orgId" placeholder="请选择门店" style="width: 200px" clearable>
+          <el-option v-for="item in storelist" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="checkClothById">
+        <el-select v-model="queryParams.checkClothById" style="width: 200px" placeholder="请选择提交人" clearable>
+          <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
 
-        <el-row :gutter="10" class="mb8">
-            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
 
-        <el-table v-loading="loading" fit highlight-current-row border stripe :data="clothingList">
-            <el-table-column label="衣物条码" align="center" prop="washCode" />
-            <el-table-column label="所属门店" align="center" prop="orgName">
-                <template slot-scope="scope">
-                    {{ scope.row.orgName ? scope.row.orgName : '--' }}
-                </template>
-            </el-table-column>
-            <el-table-column label="衣物名称" align="center" prop="clothItemName" />
-            <el-table-column label="颜色" align="center" prop="clothColorName">
-                <template slot-scope="scope">
-                    {{ getColor(scope.row.orderClothColors) }}
-                </template>
-            </el-table-column>
-            <el-table-column label="加急" align="center" prop="clothSpeedName" />
-            <el-table-column label="状态" align="center" prop="flowStatus">
-                <template slot-scope="scope">
-                    <dict-tag :options="dict.type.order_cloth_flow_status" :value="scope.row.flowStatus" />
-                </template>
-            </el-table-column>
-            <el-table-column label="检查时间" align="center" prop="takeClothTime">
-                <template slot-scope="scope">
-                    {{ scope.row.checkClothTime ? scope.row.checkClothTime : '--' }}
-                </template>
-            </el-table-column>
-        </el-table>
+    <Page uri="/mapi/order/clothItem/findFactoryClothPage" :request-params="queryParams" ref="pagination">
+      <el-table-column label="衣物条码" align="center" prop="washCode" />
+      <el-table-column label="所属门店" align="center" prop="orgName">
+        <template slot-scope="scope">
+          {{ scope.row.orgName ? scope.row.orgName : '--' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="衣物名称" align="center" prop="clothItemName" />
+      <el-table-column label="颜色" align="center" prop="clothColorName">
+        <template slot-scope="scope">
+          {{ getColor(scope.row.orderClothColors) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="加急" align="center" prop="clothSpeedName" />
+      <el-table-column label="状态" align="center" prop="flowStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.order_cloth_flow_status" :value="scope.row.flowStatus" />
+        </template>
+      </el-table-column>
+      <el-table-column label="检查时间" align="center" prop="takeClothTime">
+        <template slot-scope="scope">
+          {{ scope.row.checkClothTime ? scope.row.checkClothTime : '--' }}
+        </template>
+      </el-table-column>
+    </Page>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
-    </div>
+  </div>
 </template>
 
 <script>
@@ -63,94 +63,92 @@ import { allOrg } from '@/api/system/store'
 import { AllUser } from '@/api/system/user'
 
 export default {
-    name: 'queryInspectRecords',
-    dicts: ['order_cloth_flow_status'],
-    data() {
-        return {
-            // 遮罩层
-            loading: true,
-            // 显示搜索条件
-            showSearch: true,
-            // 总条数
-            total: 0,
-            // 表格数据
-            clothingList: [],
-            // 查询参数
-            queryParams: {
-                pageNum: 1,
-                pageSize: 10,
-                washCode: undefined,
-                orgId: undefined,
-                beginCheckClothTime: undefined,
-                endCheckClothTime: undefined,
-                flowStatus: 2
-            },
-            dateRange: '',
-            //门店下拉数据
-            storelist: [],
-            //提交人数据
-            userList: []
-        }
+  name: 'queryInspectRecords',
+  dicts: ['order_cloth_flow_status'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 表格数据
+      clothingList: [],
+      // 查询参数
+      queryParams: {
+        washCode: undefined,
+        orgId: undefined,
+        beginCheckClothTime: undefined,
+        endCheckClothTime: undefined,
+        flowStatus: 2
+      },
+      dateRange: '',
+      //门店下拉数据
+      storelist: [],
+      //提交人数据
+      userList: []
+    }
+  },
+  created() {
+    this.getList()
+    this.getStoreList()
+    this.getuserList()
+  },
+  computed: {},
+  methods: {
+    /** 查询公告列表 */
+    getList() {
+      this.loading = true
+      if (this.dateRange.length) {
+        this.queryParams.beginCheckClothTime = this.dateRange[0]
+        this.queryParams.endCheckClothTime = this.dateRange[1]
+      }
+      if (this.queryParams.orgId) {
+        const obj = this.storelist.find((item) => item.id === this.queryParams.orgId)
+        this.queryParams.sourceType = obj.sourceType
+      }
+      this.$nextTick(() => {
+        this.$refs.pagination.handleSearch(true)
+      })
+    },
+    /** 获取门店下拉数据 */
+    getStoreList() {
+      allOrg({
+        sourceType: '02'
+      }).then((response) => {
+        console.log(response)
+        this.storelist = response.data
+      })
+    },
+    // 获取提交人数据
+    getuserList() {
+      AllUser({}).then((response) => {
+        this.userList = response.data
+      })
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList()
     },
-    created() {
-        this.getList()
-        this.getStoreList()
-        this.getuserList()
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.handleQuery()
     },
-    computed: {},
-    methods: {
-        /** 查询公告列表 */
-        getList() {
-            this.loading = true
-            if (this.dateRange.length) {
-                this.queryParams.beginCheckClothTime = this.dateRange[0]
-                this.queryParams.endCheckClothTime = this.dateRange[1]
-            }
-            if (this.queryParams.orgId) {
-                const obj = this.storelist.find((item) => item.id === this.queryParams.orgId)
-                this.queryParams.sourceType = obj.sourceType
-            }
-            listfindFactoryClothPage(this.queryParams).then((response) => {
-                console.log(response)
-                this.clothingList = response.data.records
-                this.total = response.data.total
-                this.loading = false
-            })
-        },
-        /** 获取门店下拉数据 */
-        getStoreList() {
-            allOrg({
-                sourceType: '02'
-            }).then((response) => {
-                console.log(response)
-                this.storelist = response.data
-            })
-        },
-        // 获取提交人数据
-        getuserList() {
-            AllUser({}).then((response) => {
-                this.userList = response.data
-            })
-        },
-        /** 搜索按钮操作 */
-        handleQuery() {
-            this.queryParams.pageNum = 1
-            this.getList()
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-            this.resetForm('queryForm')
-            this.handleQuery()
-        },
-        //获取颜色
-        getColor(data) {
-            const _color = []
-            data.forEach((item) => {
-                _color.push(item.clothColorName)
-            })
-            return _color.join(',')
-        }
+    //获取颜色
+    getColor(data) {
+      if (data && data != null) {
+        const _color = []
+        data.forEach((item) => {
+          _color.push(item.clothColorName)
+        })
+        return _color.join(',')
+      } else {
+        return '--'
+      }
     }
+  }
 }
 </script>
 <style></style>

src/views/goods/commonGoods/setSku.vue

@@ -79,6 +79,11 @@
                                 <el-input-number v-model="form.purchasePrice" placeholder="请输入进货价" :precision="2" :step="0.1" :min="0" :max="9999999" :disabled="userInfoVO.userType != '00' ? true : false" style="width: 100%" />
                             </el-form-item>
                         </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="库存" prop="stock">
+                                <el-input-number v-model="form.stock" placeholder="请输入库存" :precision="0" :step="1" :min="0" :max="9999999" :disabled="userInfoVO.userType != '00' ? true : false" style="width: 100%" />
+                            </el-form-item>
+                        </el-col>
                     </el-row>
                     <div class="remark">* 物料规格最多两条 使用同一价格体系 *</div>
                 </div>

src/views/order/cloth/checkCloth.vue

@@ -4,7 +4,7 @@
       <el-col :span="18" :xs="24">
         <div style="width: 100%" class="verticle-view">
 
-          <el-table :data="orderClothItemVOS" highlight-current-row @cell-click="onOrderClothItemSelect">
+          <el-table :data="orderClothItemVOS" fit highlight-current-row border stripe @cell-click="onOrderClothItemSelect">
             <el-table-column
               label="序号"
               type="index"

src/views/order/cloth/collectCloth.vue

@@ -8,7 +8,7 @@
               <span>选择客户</span>
             </div>
             <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px" @submit.native.prevent>
-              <el-form-item label="手机号" prop="phoneNumber">
+              <el-form-item prop="phoneNumber">
                 <el-input
                   v-model="queryParams.phoneNumber"
                   placeholder="请输入手机号"
@@ -64,7 +64,7 @@
               </el-form-item>
             </el-form>
 
-            <el-table :data="orderClothItemDTOS" ref="clothTable">
+            <el-table :data="orderClothItemDTOS" fit highlight-current-row border stripe ref="clothTable">
               <el-table-column
                 label="序号"
                 type="index"

src/views/order/cloth/inFactory.vue

@@ -4,13 +4,8 @@
       <el-col :span="18" :xs="24">
         <div style="width: 100%" class="verticle-view">
 
-          <el-table :data="orderClothItemVOS" highlight-current-row @cell-click="onOrderClothItemSelect">
-            <el-table-column
-              label="序号"
-              type="index"
-              align="center"
-              fixed="left"
-              width="80">
+          <el-table :data="orderClothItemVOS" fit highlight-current-row border stripe @cell-click="onOrderClothItemSelect">
+            <el-table-column label="序号" type="index" align="center" fixed="left" width="80">
             </el-table-column>
             <el-table-column label="衣服条码" align="center" prop="name" width="200">
               <template slot-scope="scope">
@@ -38,23 +33,15 @@
               <template slot-scope="scope">
                 <span>
                   <template v-for="(item,index) in scope.row.orderClothFlaws">
-                  {{index == 0?item.clothFlawName:(',' + item.clothFlawName)}}
-                </template>
+                    {{index == 0?item.clothFlawName:(',' + item.clothFlawName)}}
+                  </template>
                 </span>
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200">
               <template slot-scope="scope">
-                <el-button
-                   
-                  type="text"
-                  @click="rollbackOrderClothItem(scope.$index,scope.row.washCode)"
-                >删除</el-button>
-                <el-button
-                   
-                  type="text"
-                  @click="selectClothWashProblems(scope.$index)"
-                >问题</el-button>
+                <el-button type="text" @click="rollbackOrderClothItem(scope.$index,scope.row.washCode)">删除</el-button>
+                <el-button type="text" @click="selectClothWashProblems(scope.$index)">问题</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -68,20 +55,15 @@
 
           <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="40px">
             <el-form-item label="条码" prop="washCode">
-              <el-input
-                v-model="queryParams.washCode"
-                placeholder="请输入条码"
-                clearable
-                @keyup.enter.native="searchCloth"
-              />
+              <el-input v-model="queryParams.washCode" placeholder="请输入条码" clearable @keyup.enter.native="searchCloth" />
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" icon="el-icon-search"   @click="searchCloth">查询</el-button>
+              <el-button type="primary" icon="el-icon-search" @click="searchCloth">查询</el-button>
             </el-form-item>
           </el-form>
 
           <el-descriptions title="衣物信息" :column="1">
-            <el-descriptions-item label="衣物条码" >{{orderClothItemVO?orderClothItemVO.washCode:''}}</el-descriptions-item>
+            <el-descriptions-item label="衣物条码">{{orderClothItemVO?orderClothItemVO.washCode:''}}</el-descriptions-item>
             <el-descriptions-item label="衣物名称">{{orderClothItemVO?orderClothItemVO.clothItemName:''}}</el-descriptions-item>
             <el-descriptions-item label="颜色">
               <template v-if="orderClothItemVO">
@@ -116,33 +98,28 @@
               <template v-if="orderClothItemVO">
                 <span style="color: red">
                   <template v-if="orderClothItemVO.flowStatus == 0">
-                  待入场
-                </template>
-                <template v-if="orderClothItemVO.flowStatus == 1">
-                  已入厂
-                </template>
-                <template v-if="orderClothItemVO.flowStatus == 2">
-                  已检查
-                </template>
-                <template v-if="orderClothItemVO.flowStatus == 3">
-                  已出厂
-                </template>
+                    待入场
+                  </template>
+                  <template v-if="orderClothItemVO.flowStatus == 1">
+                    已入厂
+                  </template>
+                  <template v-if="orderClothItemVO.flowStatus == 2">
+                    已检查
+                  </template>
+                  <template v-if="orderClothItemVO.flowStatus == 3">
+                    已出厂
+                  </template>
                 </span>
               </template>
             </el-descriptions-item>
           </el-descriptions>
 
-          <el-button type="primary" icon="el-icon-s-order"   @click="showClothItemDetail">详情</el-button>
+          <el-button type="primary" icon="el-icon-s-order" @click="showClothItemDetail">详情</el-button>
         </el-card>
       </el-col>
     </el-row>
 
-    <el-dialog
-      title="入厂信息"
-      :visible.sync="clothItemDetailOpen"
-      width="50%"
-      :before-close="handleClose"
-      center>
+    <el-dialog title="入厂信息" :visible.sync="clothItemDetailOpen" width="50%" :before-close="handleClose" center>
       <el-descriptions :column="3">
         <el-descriptions-item label="衣物条码" :span="3">{{orderClothItemVO?orderClothItemVO.washCode:''}}</el-descriptions-item>
         <el-descriptions-item label="衣物名称" :span="3">{{orderClothItemVO?orderClothItemVO.clothItemName:''}}</el-descriptions-item>
@@ -184,65 +161,53 @@
 
     </el-dialog>
 
-    <el-dialog
-      title="衣服问题"
-      :visible.sync="selectClothWashProblemOpen"
-      width="50%"
-      :before-close="handleClose"
-      center>
-        <el-row :gutter="15">
-          <el-form size="small" label-width="120px">
+    <el-dialog title="衣服问题" :visible.sync="selectClothWashProblemOpen" width="50%" :before-close="handleClose" center>
+      <el-row :gutter="15">
+        <el-form size="small" label-width="120px">
           <el-col :span="24">
             <el-form-item label="检查的问题" prop="washCode">
-              <el-input
-                v-model="clothProblemContent"
-                placeholder="请输入检查的问题"
-                type="textarea"
-                :rows="5"
-                maxlength="500"
-                show-word-limit
-                :style="{width: '100%'}"
-              />
+              <el-input v-model="clothProblemContent" placeholder="请输入检查的问题" type="textarea" :rows="5" maxlength="500" show-word-limit
+                :style="{width: '100%'}" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-table :data="washProblems" style="width: 100%" max-height="400" highlight-current-row @cell-dblclick="addSelectWashProblem">
-              <el-table-column label="问题" align="center" prop="content"/>
+              <el-table-column label="问题" align="center" prop="content" />
             </el-table>
           </el-col>
-          </el-form>
-        </el-row>
+        </el-form>
+      </el-row>
       <span slot="footer" class="dialog-footer">
-          <el-button @click="selectClothWashProblemOpen = false">取 消</el-button>
-          <el-button type="primary" @click="saveWashProblem">确 定</el-button>
-        </span>
+        <el-button @click="selectClothWashProblemOpen = false">取 消</el-button>
+        <el-button type="primary" @click="saveWashProblem">确 定</el-button>
+      </span>
     </el-dialog>
   </div>
 
 </template>
 
 <script>
-import {inFactory,deleteInFactory,setClothProblem} from "../../../api/order/clothItem";
-import {allWashProblem} from "@/api/cloth/washProblem";
+import { inFactory, deleteInFactory, setClothProblem } from "../../../api/order/clothItem";
+import { allWashProblem } from "@/api/cloth/washProblem";
 import order from "@/views/recharge/order/index.vue";
 
 export default {
   name: "InFactory",
   computed: {
   },
-  dicts: ['sys_yes_no','cloth_type','cloth_send_type'],
-  data(){
+  dicts: ['sys_yes_no', 'cloth_type', 'cloth_send_type'],
+  data() {
     return {
       // 查询参数
       queryParams: {
       },
-      orderClothItemVO:null,
-      orderClothItemVOS:[],
-      clothItemDetailOpen:false,
-      washProblems:[],
-      selectClothWashProblemOpen:false,
-      selectClothItemIndex:null,
-      clothProblemContent:'',
+      orderClothItemVO: null,
+      orderClothItemVOS: [],
+      clothItemDetailOpen: false,
+      washProblems: [],
+      selectClothWashProblemOpen: false,
+      selectClothItemIndex: null,
+      clothProblemContent: '',
     }
   },
   created() {
@@ -250,9 +215,9 @@ export default {
       this.washProblems = res.data
     })
   },
-  methods:{
-    searchCloth(){
-      if(this.isEmpty(this.queryParams.washCode)){
+  methods: {
+    searchCloth() {
+      if (this.isEmpty(this.queryParams.washCode)) {
         this.$message.error('请先输入衣服条码')
         return
       }
@@ -261,7 +226,7 @@ export default {
         this.orderClothItemVOS.push(res.data)
       })
     },
-    showClothItemDetail(){
+    showClothItemDetail() {
       this.clothItemDetailOpen = true
     },
     handleClose(done) {
@@ -269,41 +234,41 @@ export default {
         .then(_ => {
           done();
         })
-        .catch(_ => {});
+        .catch(_ => { });
     },
-    rollbackOrderClothItem(index,washCode){
+    rollbackOrderClothItem(index, washCode) {
       this.$confirm('确定要删除这条入厂记录吗？')
         .then(_ => {
-          deleteInFactory({washCode:washCode}).then(res => {
-            this.orderClothItemVOS.splice(index,1)
+          deleteInFactory({ washCode: washCode }).then(res => {
+            this.orderClothItemVOS.splice(index, 1)
           })
         })
-        .catch(_ => {});
+        .catch(_ => { });
 
     },
-    selectClothWashProblems(index){
+    selectClothWashProblems(index) {
       this.selectClothItemIndex = index
       this.clothProblemContent = this.orderClothItemVOS[index].clothProblem
       this.selectClothWashProblemOpen = true
 
     },
-    addSelectWashProblem(row, column, cell, event){
-      if(this.clothProblemContent == null){
+    addSelectWashProblem(row, column, cell, event) {
+      if (this.clothProblemContent == null) {
         this.clothProblemContent = ''
       }
-      if(!this.isEmpty(this.clothProblemContent)){
+      if (!this.isEmpty(this.clothProblemContent)) {
         this.clothProblemContent += '，'
       }
       this.clothProblemContent += row.content
     },
-    saveWashProblem(){
-      setClothProblem({id:this.orderClothItemVOS[this.selectClothItemIndex].id,clothProblem:this.clothProblemContent}).then(res => {
+    saveWashProblem() {
+      setClothProblem({ id: this.orderClothItemVOS[this.selectClothItemIndex].id, clothProblem: this.clothProblemContent }).then(res => {
         this.orderClothItemVOS[this.selectClothItemIndex].clothProblem = this.clothProblemContent
         this.selectClothWashProblemOpen = false
         this.$message.success('设置成功')
       })
     },
-    onOrderClothItemSelect(row){
+    onOrderClothItemSelect(row) {
       this.orderClothItemVO = row
       this.queryParams.washCode = this.orderClothItemVO.washCode
     }
@@ -312,5 +277,4 @@ export default {
 </script>
 
 <style scoped>
-
 </style>

src/views/order/cloth/outFactory.vue

@@ -2,34 +2,30 @@
   <div class="app-container">
     <!-- 查询 -->
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="选择门店" prop="brandId">
+      <el-form-item prop="brandId">
         <el-select v-model="queryParams.orgId" placeholder="请选择门店" clearable>
-          <el-option v-for="org in orgList"
-                     :key="org.id" :label="org.name" :value="org.id" />
+          <el-option v-for="org in orgList" :key="org.id" :label="org.name" :value="org.id" />
         </el-select>
       </el-form-item>
-      <el-form-item label="衣服编码" prop="goodsName">
-        <el-input v-model="queryParams.washCode" placeholder="请输入衣服编码" clearable
-                  @keyup.enter.native="handleQuery"/>
+      <el-form-item prop="goodsName">
+        <el-input v-model="queryParams.washCode" placeholder="请输入衣服编码" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search"   @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh"   @click="resetQuery">重置</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-upload2"
-                     @click="onOutFactoryClick"
-        >批量出厂</el-button>
+        <el-button type="primary" plain icon="el-icon-upload2" @click="onOutFactoryClick">批量出厂</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <el-row :gutter="20">
       <el-col :span="24" :xs="24">
         <div style="width: 100%" class="verticle-view">
-          <el-table ref="table" :data="orderClothItemVOS" highlight-current-row row-key="id" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" reserve-selection="true"/>
+          <el-table ref="table" :data="orderClothItemVOS" fit highlight-current-row border stripe row-key="id" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" align="center" reserve-selection="true" />
             <el-table-column label="衣服条码" align="center" prop="name" width="200">
               <template slot-scope="scope">
                 <span>{{scope.row.washCode}}</span>
@@ -56,8 +52,8 @@
               <template slot-scope="scope">
                 <span>
                   <template v-for="(item,index) in scope.row.orderClothFlaws">
-                  {{index == 0?item.clothFlawName:(',' + item.clothFlawName)}}
-                </template>
+                    {{index == 0?item.clothFlawName:(',' + item.clothFlawName)}}
+                  </template>
                 </span>
               </template>
             </el-table-column>
@@ -67,16 +63,16 @@
                 <span v-else>{{scope.row.storeName}}</span>
               </template>
             </el-table-column>
-            <el-table-column label="附件" align="center" >
+            <el-table-column label="附件" align="center">
               <template slot-scope="scope">
                 <span>
                   <template v-for="(item,index) in scope.row.orderClothAdjuncts">
-                  {{index == 0?(item.adjunctName + ' * ' + item.num):(',' + item.adjunctName + ' * ' + item.num)}}
-                </template>
+                    {{index == 0?(item.adjunctName + ' * ' + item.num):(',' + item.adjunctName + ' * ' + item.num)}}
+                  </template>
                 </span>
               </template>
             </el-table-column>
-            <el-table-column label="状态" align="center" >
+            <el-table-column label="状态" align="center">
               <template slot-scope="scope">
                 <span v-if="scope.row.flowStatus == '0'">待入厂</span>
                 <span v-if="scope.row.flowStatus == '1'">已入厂</span>
@@ -87,13 +83,7 @@
             </el-table-column>
           </el-table>
 
-          <pagination
-            v-show="total>0"
-            :total="total"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getList"
-          />
+          <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
         </div>
       </el-col>
     </el-row>
@@ -102,16 +92,16 @@
 </template>
 
 <script>
-import {findOutFactoryPageByFlowStatus,outFactory} from "../../../api/order/clothItem";
-import {allOrg} from "../../../api/system/store";
-import {delType} from "@/api/coupon/type";
+import { findOutFactoryPageByFlowStatus, outFactory } from "../../../api/order/clothItem";
+import { allOrg } from "../../../api/system/store";
+import { delType } from "@/api/coupon/type";
 
 export default {
   name: "InFactory",
   computed: {
   },
-  dicts: ['sys_yes_no','cloth_type','cloth_send_type'],
-  data(){
+  dicts: ['sys_yes_no', 'cloth_type', 'cloth_send_type'],
+  data() {
     return {
       // 遮罩层
       loading: true,
@@ -128,18 +118,18 @@ export default {
         pageNum: 1,
         pageSize: 10,
       },
-      orgList:[],
-      orderClothItemVOS:[],
-      total:0,
+      orgList: [],
+      orderClothItemVOS: [],
+      total: 0,
     }
   },
   created() {
-    allOrg({sourceType: '02'}).then(res => {
+    allOrg({ sourceType: '02' }).then(res => {
       this.orgList = res.data
     })
     this.getList();
   },
-  methods:{
+  methods: {
     /** 搜索按钮操作 */
     handleQuery() {
       this.ids = []
@@ -153,10 +143,10 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    showClothItemDetail(){
+    showClothItemDetail() {
       this.clothItemDetailOpen = true
     },
-    getList(){
+    getList() {
       findOutFactoryPageByFlowStatus(this.queryParams).then(res => {
         this.orderClothItemVOS = res.data.records
         this.total = res.data.total
@@ -165,20 +155,20 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
-    onOutFactoryClick(){
-      if(this.ids.length == 0){
+    onOutFactoryClick() {
+      if (this.ids.length == 0) {
         this.$message.error('请先选择出厂的衣服')
         return
       }
       this.$modal.confirm('确定要对这些衣服进行出厂处理吗？').then(() => {
-        return outFactory({ids:this.ids})
+        return outFactory({ ids: this.ids })
       }).then(res => {
         this.$message.success('出厂成功')
         this.handleQuery()
-      }).catch(() => {});
+      }).catch(() => { });
 
     }
   }
@@ -186,5 +176,4 @@ export default {
 </script>
 
 <style scoped>
-
 </style>

src/views/order/cloth/searchCloth.vue

@@ -1,30 +1,30 @@
 <template>
     <div class="app-container">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item label="衣服状态" prop="flowStatus">
+            <el-form-item  prop="flowStatus">
                 <el-select v-model="queryParams.flowStatus" placeholder="请选择衣服状态" clearable>
                     <el-option key="0" label="清洗中" value="0" />
                     <el-option key="1" label="已上挂" value="1" />
                     <el-option key="2" label="已取衣" value="2" />
                 </el-select>
             </el-form-item>
-            <el-form-item label="创建时间">
-                <el-date-picker v-model="createTimeRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+            <el-form-item>
+                <el-date-picker v-model="createTimeRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="下单日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
-            <el-form-item label="衣服条码" prop="washCode">
+            <el-form-item  prop="washCode">
                 <el-input v-model="queryParams.washCode" placeholder="请输入衣服条码" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
-            <el-form-item label="衣服名称" prop="clothItemName">
+            <el-form-item  prop="clothItemName">
                 <el-input v-model="queryParams.clothItemName" placeholder="请输入衣服名称" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
-            <el-form-item label="取衣时间">
-                <el-date-picker v-model="takeClothTimeRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+            <el-form-item >
+                <el-date-picker v-model="takeClothTimeRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="取衣日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
 
-            <el-form-item label="客户电话" prop="appUserPhoneNumber">
+            <el-form-item prop="appUserPhoneNumber">
                 <el-input v-model="queryParams.appUserPhoneNumber" placeholder="请输入客户电话" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
-            <el-form-item label="挂衣号" prop="clothHangerId">
+            <el-form-item  prop="clothHangerId">
                 <el-input v-model="queryParams.clothHangerId" placeholder="请输入挂衣号" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
 

src/views/statistics/queryReception.vue

@@ -1,17 +1,17 @@
 <template>
     <div class="app-container">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item label="衣服条码" prop="washCode">
+            <el-form-item  prop="washCode">
                 <el-input v-model="queryParams.washCode" placeholder="请输入衣服条码" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
-            <el-form-item label="收衣时间">
-                <el-date-picker v-model="createTimeRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+            <el-form-item >
+                <el-date-picker v-model="createTimeRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="收衣日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
-            <el-form-item label="衣服名称" prop="clothItemName">
+            <el-form-item  prop="clothItemName">
                 <el-input v-model="queryParams.clothItemName" placeholder="请输入衣服名称" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
 
-            <el-form-item label="客户电话" prop="appUserPhoneNumber">
+            <el-form-item prop="appUserPhoneNumber">
                 <el-input v-model="queryParams.appUserPhoneNumber" placeholder="请输入客户电话" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
 

src/views/workbench/workAppointmentOrder/index.vue

@@ -1,16 +1,16 @@
 <template>
     <div class="app-container">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item label="订单编号" prop="orderNo">
+            <el-form-item prop="orderNo">
                 <el-input v-model="queryParams.orderNo" placeholder="请输入订单编号" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
-            <el-form-item label="预约时间" prop="appointmentTime">
+            <el-form-item prop="appointmentTime">
                 <el-date-picker clearable v-model="queryParams.appointmentTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择创建时间"> </el-date-picker>
             </el-form-item>
-            <el-form-item label="客户名称" prop="contactName">
+            <el-form-item prop="contactName">
                 <el-input v-model="queryParams.contactName" placeholder="请输入客户名称" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
-            <el-form-item label="客户手机号" prop="contactPhone" label-width="90px">
+            <el-form-item  prop="contactPhone" label-width="90px">
                 <el-input v-model="queryParams.contactPhone" placeholder="请输入客户手机号" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
             <el-form-item>

src/views/workbench/workNotice/index.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="app-container">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item label="公告标题" prop="noticeTitle">
+            <el-form-item  prop="noticeTitle">
                 <el-input v-model="queryParams.noticeTitle" placeholder="请输入公告标题" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
             <el-form-item>
@@ -14,8 +14,7 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" fit highlight-current-row border stripe :data="noticeList">
-            <!--      <el-table-column type="selection" width="55" align="center" />-->
+            <Page uri="/system/notice/workbench/list" :request-params="queryParams" ref="pagination">
             <el-table-column label="序号" align="center" prop="noticeId" width="100" />
             <el-table-column label="公告标题" align="center" prop="noticeTitle" :show-overflow-tooltip="true" />
             <el-table-column label="公告类型" align="center" prop="noticeType" width="100">
@@ -39,10 +38,9 @@
                     <el-button type="text" icon="el-icon-edit" @click="openDetail(scope.row)">详情</el-button>
                 </template>
             </el-table-column>
-        </el-table>
-
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+        </Page>
 
+      
         <!-- 添加或修改公告对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="60%" append-to-body>
             <el-form ref="form" :model="form" :rules="rules" label-width="80px">
@@ -93,8 +91,6 @@ export default {
             open: false,
             // 查询参数
             queryParams: {
-                pageNum: 1,
-                pageSize: 10,
                 noticeTitle: undefined,
                 createBy: undefined,
                 status: undefined
@@ -111,11 +107,8 @@ export default {
     methods: {
         /** 查询公告列表 */
         getList() {
-            this.loading = true
-            listWorkbenchNotice(this.queryParams).then((response) => {
-                this.noticeList = response.rows
-                this.total = response.total
-                this.loading = false
+            this.$nextTick(() => {
+                this.$refs.pagination.handleSearch(true)
             })
         },
         // 表单重置