Browse Source

Merge remote-tracking branch 'origin/master'

BKGin 9 months ago
parent
commit
44c8abc77c

+ 2 - 5
.env.development

@@ -5,13 +5,10 @@ VUE_APP_TITLE = 一七生活管理系统(测试)
 ENV = 'development'
 
 # 一七生活管理系统/开发环境
-# VUE_APP_BASE_API_HOST = 'http://localhost:9801'
-# VUE_APP_BASE_API = 'http://localhost:9801'
+VUE_APP_BASE_API_HOST = 'http://127.0.0.1:9801'
+VUE_APP_BASE_API = 'http://127.0.0.1:9801'
 # VUE_APP_BASE_API_HOST = 'http://139.224.65.227:8091/prod-api'
 # VUE_APP_BASE_API = 'http://139.224.65.227:8091/prod-api'
-VUE_APP_BASE_API_HOST = 'http://192.168.98.9:9801'
-VUE_APP_BASE_API = 'http://192.168.98.9:9801/'
-
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

+ 1 - 1
src/api/order/clothItem.js

@@ -61,7 +61,7 @@ export function listOrderClothItem(query) {
     return request({
         url: '/mapi/order/clothItem/list',
         method: 'get',
-        data: query
+        params: query
     })
 }
 

+ 1 - 1
src/components/Page/index.vue

@@ -2,7 +2,7 @@
     <el-card class="box-card" style="margin-top: 12px">
         <div class="table-pagination-container">
             <!-- 数据列表 -->
-            <el-table ref="table" :data="data" @selection-change="selectionChange" v-loading="isLoading" current-row-key="aaa" element-loading-text="给我一点时间" :show-header="showHeader"  fit highlight-current-row border stripe>
+            <el-table ref="table" :data="data" @selection-change="selectionChange" v-loading="isLoading" current-row-key="aaa" element-loading-text="给我一点时间" :show-header="showHeader" fit highlight-current-row border stripe>
                 <el-table-column header-align="center" align="center" type="selection" width="55" v-if="showCheck"> </el-table-column>
                 <el-table-column v-if="getShowIndex" align="center" :label="$t('message.index')">
                     <template slot-scope="scope">

+ 1 - 1
src/views/activity/clothItem/index.vue

@@ -30,7 +30,7 @@
             <el-table-column label="衣服名称" align="center" prop="clothItemName" />
             <el-table-column label="指定折扣" align="center" prop="discount" />
             <!--            <el-table-column label="指定价格" align="center" prop="price" />-->
-            <el-table-column label="洗衣类型" align="center" prop="washModeName" />
+            <!--            <el-table-column label="洗衣类型" align="center" prop="washModeName" />-->
             <el-table-column label="创建人" align="center" prop="createBy" />
             <el-table-column label="创建时间" align="center" prop="createTime" />
             <el-table-column label="修改人" align="center" prop="updateBy" />

+ 33 - 12
src/views/app/banner/index.vue

@@ -46,21 +46,28 @@
                     <el-image style="width: 80px; height: 80px" :src="scope.row.imgUrl" :preview-src-list="[scope.row.imgUrl]"> </el-image>
                 </template>
             </el-table-column>
-            <el-table-column label="图片类型" align="center" prop="bannerType">
-                <template slot-scope="scope">
-                    <dict-tag :options="dict.type.app_banner_type" :value="scope.row.bannerType" />
-                </template>
-            </el-table-column>
+            <el-table-column label="标题" align="center" prop="redirectTitle" />
+            <!--            <el-table-column label="图片类型" align="center" prop="bannerType">-->
+            <!--                <template slot-scope="scope">-->
+            <!--                    <dict-tag :options="dict.type.app_banner_type" :value="scope.row.bannerType" />-->
+            <!--                </template>-->
+            <!--            </el-table-column>-->
             <el-table-column label="点击类型" align="center" prop="clickType">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.app_banner_click_type" :value="scope.row.clickType" />
                 </template>
             </el-table-column>
+
             <el-table-column label="启用状态" align="center" prop="status">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
                 </template>
             </el-table-column>
+            <el-table-column label="是否热销" align="center" prop="isHot" width="120" v-if="bannerType == 3">
+                <template slot-scope="scope">
+                    <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isHot" />
+                </template>
+            </el-table-column>
             <el-table-column label="创建人" align="center" prop="createBy" />
             <el-table-column label="创建时间" align="center" prop="createTime" width="180" />
             <el-table-column label="修改人" align="center" prop="updateBy" />
@@ -99,6 +106,11 @@
                             </el-radio-group>
                         </el-form-item>
                     </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="标题" prop="redirectTitle">
+                            <el-input v-model="form.redirectTitle" placeholder="请输入标题" />
+                        </el-form-item>
+                    </el-col>
                     <el-col :span="24" v-if="form.clickType == '1'">
                         <el-form-item label="跳转内容" prop="redirectContent">
                             <el-input v-model="form.redirectContent" placeholder="请输入跳转网址" />
@@ -109,11 +121,18 @@
                             <editor v-model="form.redirectContent" :min-height="192" />
                         </el-form-item>
                     </el-col>
-                  <el-col :span="24" v-if="form.clickType == '3'">
-                    <el-form-item label="跳转内容" prop="redirectContent">
-                      <el-input v-model="form.redirectContent" placeholder="请输入内部页面路径" />
-                    </el-form-item>
-                  </el-col>
+                    <el-col :span="24" v-if="form.clickType == '3'">
+                        <el-form-item label="跳转内容" prop="redirectContent">
+                            <el-input v-model="form.redirectContent" placeholder="请输入内部页面路径" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24" v-if="bannerType == 3">
+                        <el-form-item label="是否热销" prop="isHot">
+                            <el-radio-group v-model="form.isHot">
+                                <el-radio-button v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio-button>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
                     <el-col :span="24">
                         <el-form-item label="状态" prop="status">
                             <el-radio-group v-model="form.status" size="small">
@@ -136,7 +155,7 @@ import { listBanner, getBanner, delBanner, addBanner, updateBanner } from '@/api
 
 export default {
     name: 'Banner',
-    dicts: ['app_banner_type', 'app_banner_click_type', 'sys_normal_disable'],
+    dicts: ['app_banner_type', 'app_banner_click_type', 'sys_yes_no', 'sys_normal_disable'],
     data() {
         return {
             uploadAction: `${process.env.VUE_APP_BASE_API}` + '/common/uploadOSS',
@@ -169,7 +188,9 @@ export default {
                 updateById: null
             },
             // 表单参数
-            form: {},
+            form: {
+                isHot: 'N'
+            },
             // 表单校验
             rules: {
                 bannerType: [

+ 6 - 25
src/views/app/delivery/index.vue

@@ -23,27 +23,16 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" fit highlight-current-row border stripe :data="deliveryList" @selection-change="handleSelectionChange" fit highlight-current-row border stripe>
+        <Page uri="/mapi/app/delivery/page" :request-params="queryParams" ref="pagination">
             <el-table-column label="姓名" align="center" prop="realName" width="150" />
             <el-table-column label="手机号" align="center" prop="phoneNumber" width="150" />
             <el-table-column label="简介" align="center" prop="description" width="220" show-overflow-tooltip />
             <el-table-column label="等级" align="center" prop="level" />
-            <el-table-column label="积分" align="center">
-                <template slot-scope="scope">
-                    <span> {{ scope.row.pointBalance == null ? '0' : scope.row.pointBalance }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="订单数量" align="center" prop="orderCount" />
             <el-table-column label="绑定门店数量" align="center">
                 <template slot-scope="scope">
                     <span> {{ scope.row.relationStoreNum == null ? '0' : scope.row.relationStoreNum }}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="总接单数" align="center">
-                <template slot-scope="scope">
-                    <span> {{ scope.row.clothOrderTotalNum == null ? '0' : scope.row.clothOrderTotalNum }}</span>
-                </template>
-            </el-table-column>
             <el-table-column label="状态" align="center" prop="status">
                 <template slot-scope="scope">
                     <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
@@ -55,10 +44,7 @@
                     <el-button type="text" icon="el-icon-delete" @click="recordDetail(scope.row)" v-hasPermi="['app:delivery:edit']">接单记录</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" size="50%" append-to-body>
             <el-row :gutter="10" style="margin-right: 20px; margin-left: 20px; width: 95%">
@@ -105,8 +91,8 @@
 
         <!--   接单记录 -->
         <el-dialog v-loading="loading" :title="recordDetailTitle" :visible.sync="openDetail" size="80%" append-to-body>
-            <div class="head-column1" style="margin-top: 40px">
-                <el-table v-loading="loading" fit highlight-current-row border stripe :data="recordDetailList">
+            <div class="head-column1" style="margin-top: 5px">
+                <el-table fit highlight-current-row border stripe :data="recordDetailList">
                     <el-table-column label="订单编号" align="center" prop="orderNo" width="200" />
                     <el-table-column label="门店名称" align="center" prop="storeName" width="150" />
                     <el-table-column label="派送员姓名" align="center" prop="realName" width="100" />
@@ -165,8 +151,6 @@ export default {
             openDetail: false,
             // 查询参数
             queryParams: {
-                pageNum: 1,
-                pageSize: 10,
                 appUserName: null,
                 phoneNumber: null
             },
@@ -212,11 +196,8 @@ export default {
         },
         /** 查询配送员列表 */
         getList() {
-            this.loading = true
-            listDelivery(this.queryParams).then((response) => {
-                this.deliveryList = response.data
-                this.total = response.data.length
-                this.loading = false
+            this.$nextTick(() => {
+                this.$refs.pagination.handleSearch(true)
             })
         },
         // 取消按钮

+ 128 - 126
src/views/cloth/inquiry/queryEntryRecord.vue

@@ -1,54 +1,56 @@
 <template>
-  <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>
+    <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>
-
-    <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>
+        <el-row :gutter="10" class="mb8">
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+        <el-tabs v-model="queryParams.clothType" @tab-click="handleQuery">
+            <el-tab-pane label="衣服" name="1"></el-tab-pane>
+            <el-tab-pane label="附件" name="2"></el-tab-pane>
+        </el-tabs>
+        <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>
@@ -56,86 +58,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: {
-        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]
-      }
-      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)
-      })
-
+    name: 'queryEntryRecord',
+    dicts: ['order_cloth_flow_status'],
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 表格数据
+            recordsList: [],
+            // 查询参数
+            queryParams: {
+                washCode: undefined,
+                orgId: undefined,
+                clothType: '1',
+                beginInFactoryTime: undefined,
+                endInFactoryTime: undefined,
+                flowStatus: 1
+            },
+            dateRange: '',
+            //门店下拉数据
+            storelist: []
+        }
     },
-    /** 获取门店下拉数据 */
-    getStoreList() {
-      allOrg({
-        sourceType: '02'
-      }).then((response) => {
-        console.log(response)
-        this.storelist = response.data
-      })
+    created() {
+        this.getList()
+        this.getStoreList()
     },
-    /** 搜索按钮操作 */
-    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 '--'
-      }
+    computed: {},
+    methods: {
+        /** 查询公告列表 */
+        getList() {
+            this.loading = true
+
+            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)
+            })
+        },
+        /** 获取门店下拉数据 */
+        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>

+ 115 - 112
src/views/cloth/inquiry/queryFactoryClothing.vue

@@ -1,51 +1,53 @@
 <template>
-  <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>
+    <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>
-
-    <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>
+        <el-row :gutter="10" class="mb8">
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+        <el-tabs v-model="queryParams.clothType" @tab-click="handleQuery">
+            <el-tab-pane label="衣服" name="1"></el-tab-pane>
+            <el-tab-pane label="附件" name="2"></el-tab-pane>
+        </el-tabs>
+        <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>
@@ -53,75 +55,76 @@ 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: {
-        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()
+    name: 'queryFactoryClothing',
+    dicts: ['order_cloth_flow_status'],
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 表格数据
+            clothingList: [],
+            // 查询参数
+            queryParams: {
+                washCode: undefined,
+                clothType: '1',
+                orgId: undefined
+            },
+            //门店下拉数据
+            storelist: []
+        }
     },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm('queryForm')
-      this.handleQuery()
+    created() {
+        this.getList()
+        this.getStoreList()
     },
-    //获取颜色
-    getColor(data) {
-      if (data && data != null) {
-        const _color = []
-        data.forEach((item) => {
-          _color.push(item.clothColorName)
-        })
-        return _color.join(',')
-      } else {
-        return '--'
-      }
+    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()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm('queryForm')
+            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>

+ 135 - 133
src/views/cloth/inquiry/queryFactoryRecords.vue

@@ -1,51 +1,52 @@
 <template>
-  <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>
+    <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>
-
-    <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>
-
-  </div>
+        <el-row :gutter="10" class="mb8">
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+        <el-tabs v-model="queryParams.clothType" @tab-click="handleQuery">
+            <el-tab-pane label="衣服" name="1"></el-tab-pane>
+            <el-tab-pane label="附件" name="2"></el-tab-pane>
+        </el-tabs>
+        <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>
+    </div>
 </template>
 
 <script>
@@ -54,96 +55,97 @@ 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: {
-        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.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)
-      })
+    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,
+                clothType: '1',
+                flowStatus: 3
+            },
+            dateRange: '',
+            //门店下拉数据
+            storelist: [],
+            //提交人数据
+            userList: []
+        }
     },
-    /** 获取门店下拉数据 */
-    getStoreList() {
-      allOrg({
-        sourceType: '02'
-      }).then((response) => {
-        this.storelist = response.data
-      })
+    created() {
+        this.getList()
+        this.getStoreList()
+        this.getuserList()
     },
-    // 获取提交人数据
-    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 '--'
-      }
+    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.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>

+ 140 - 138
src/views/cloth/inquiry/queryInspectRecords.vue

@@ -1,60 +1,61 @@
 <template>
-  <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>
+    <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>
-
-    <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>
-
-  </div>
+        <el-row :gutter="10" class="mb8">
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+        <el-tabs v-model="queryParams.clothType" @tab-click="handleQuery">
+            <el-tab-pane label="衣服" name="1"></el-tab-pane>
+            <el-tab-pane label="附件" name="2"></el-tab-pane>
+        </el-tabs>
+        <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>
+    </div>
 </template>
 
 <script>
@@ -63,92 +64,93 @@ 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: {
-        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()
+    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,
+                clothType: '1',
+                flowStatus: 2
+            },
+            dateRange: '',
+            //门店下拉数据
+            storelist: [],
+            //提交人数据
+            userList: []
+        }
     },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm('queryForm')
-      this.handleQuery()
+    created() {
+        this.getList()
+        this.getStoreList()
+        this.getuserList()
     },
-    //获取颜色
-    getColor(data) {
-      if (data && data != null) {
-        const _color = []
-        data.forEach((item) => {
-          _color.push(item.clothColorName)
-        })
-        return _color.join(',')
-      } else {
-        return '--'
-      }
+    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()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm('queryForm')
+            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>

+ 1 - 1
src/views/order/cloth/collectCloth.vue

@@ -150,7 +150,7 @@
                     <br />
 
                     <el-form-item label="会员余额:" prop="userAmount">
-                        <span v-if="appUserInfo">{{ appUserInfo.rechargeBalance + appUserInfo.giveBalance }}</span>
+                        <span v-if="appUserInfo">{{ Math.round((appUserInfo.rechargeBalance + appUserInfo.giveBalance) * 100) / 100  }}</span>
                         <span v-else>0</span>
                     </el-form-item>
 

+ 1 - 1
src/views/order/cloth/component/cashCloth.vue

@@ -5,7 +5,7 @@
                 <el-descriptions title="核对信息" border :column="3" :label-style="{ width: '120px' }">
                     <el-descriptions-item label="总件数">{{ orderClothItemDTOS.length }}</el-descriptions-item>
                     <el-descriptions-item label="总价格(元)">{{ calculateTotalPrice() + calculateDeliveryPrice() }}</el-descriptions-item>
-                    <el-descriptions-item label="卡余额(元)" v-if="appUserInfo">{{ appUserInfo.rechargeBalance + appUserInfo.giveBalance }}</el-descriptions-item>
+                    <el-descriptions-item label="卡余额(元)" v-if="appUserInfo">{{ Math.round((appUserInfo.rechargeBalance + appUserInfo.giveBalance) * 100) / 100 }}</el-descriptions-item>
                     <el-descriptions-item label="卡余额(元)" v-else>0</el-descriptions-item>
                     <el-descriptions-item label="衣服价格(元)">{{ calculateTotalPrice() }}</el-descriptions-item>
                     <el-descriptions-item label="优惠金额(元)">{{ calculateTotalDiscountAmount() }}</el-descriptions-item>

+ 249 - 262
src/views/order/cloth/inFactory.vue

@@ -1,280 +1,267 @@
 <template>
-  <div class="app-container">
-    <el-row :gutter="20">
-      <el-col :span="18" :xs="24">
-        <div style="width: 100%" class="verticle-view">
+    <div class="app-container">
+        <el-row :gutter="20">
+            <el-col :span="18" :xs="24">
+                <div style="width: 100%" class="verticle-view">
+                    <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">
+                                <span>{{ scope.row.washCode }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="衣服名称" align="center" prop="name" width="150">
+                            <template slot-scope="scope">
+                                <span>{{ scope.row.clothItemName }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="衣服品牌" align="center" prop="name" width="120">
+                            <template slot-scope="scope">
+                                <span>{{ scope.row.clothBrandName }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="衣服颜色" align="center" prop="name" width="150">
+                            <template slot-scope="scope">
+                                <template v-for="(item, index) in scope.row.orderClothColors">
+                                    {{ index == 0 ? item.clothColorName : ',' + item.clothColorName }}
+                                </template>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="衣服瑕疵" align="center" prop="name">
+                            <template slot-scope="scope">
+                                <span>
+                                    <template v-for="(item, index) in scope.row.orderClothFlaws">
+                                        {{ 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)" :v-if="isAdjunct == 'N'">问题</el-button>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </div>
+            </el-col>
+            <el-col :span="6" :xs="24">
+                <el-card class="box-card">
+                    <div slot="header" class="clearfix">
+                        <span>衣服信息</span>
+                    </div>
 
-          <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">
-                <span>{{scope.row.washCode}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="衣服名称" align="center" prop="name" width="150">
-              <template slot-scope="scope">
-                <span>{{scope.row.clothItemName}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="衣服品牌" align="center" prop="name" width="120">
-              <template slot-scope="scope">
-                <span>{{scope.row.clothBrandName}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="衣服颜色" align="center" prop="name" width="150">
-              <template slot-scope="scope">
-                <template v-for="(item,index) in scope.row.orderClothColors">
-                  {{index == 0?item.clothColorName:(',' + item.clothColorName)}}
-                </template>
-              </template>
-            </el-table-column>
-            <el-table-column label="衣服瑕疵" align="center" prop="name">
-              <template slot-scope="scope">
-                <span>
-                  <template v-for="(item,index) in scope.row.orderClothFlaws">
-                    {{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>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-      </el-col>
-      <el-col :span="6" :xs="24">
-        <el-card class="box-card">
-          <div slot="header" class="clearfix">
-            <span>衣服信息</span>
-          </div>
+                    <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-form-item>
+                        <el-form-item>
+                            <el-button type="primary" icon="el-icon-search" @click="searchCloth">查询</el-button>
+                        </el-form-item>
+                    </el-form>
 
-          <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-form-item>
-            <el-form-item>
-              <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.clothItemName : '' }} </el-descriptions-item>
+                        <el-descriptions-item label="颜色">
+                            <template v-if="orderClothItemVO">
+                                <template v-for="(color, index) in orderClothItemVO.orderClothColors">
+                                    {{ index == 0 ? color.clothColorName : ',' + color.clothColorName }}
+                                </template>
+                            </template>
+                        </el-descriptions-item>
+                        <el-descriptions-item label="瑕疵">
+                            <template v-if="orderClothItemVO">
+                                <template v-for="(color, index) in orderClothItemVO.orderClothFlaws">
+                                    {{ index == 0 ? color.clothFlawName : ',' + color.clothFlawName }}
+                                </template>
+                            </template>
+                        </el-descriptions-item>
+                        <el-descriptions-item label="特殊处理">
+                            <template v-if="orderClothItemVO">
+                                <template v-for="(color, index) in orderClothItemVO.orderClothCrafts">
+                                    {{ index == 0 ? color.clothCraftName : ',' + color.clothCraftName }}
+                                </template>
+                            </template>
+                        </el-descriptions-item>
+                        <el-descriptions-item label="附件" v-if="orderClothItemVO && orderClothItemVO.isAdjunct == 'N'">
+                            <template v-if="orderClothItemVO">
+                                <template v-for="(color, index) in orderClothItemVO.orderClothAdjuncts">
+                                    {{ index == 0 ? color.adjunctName : ',' + color.adjunctName }}
+                                </template>
+                            </template>
+                        </el-descriptions-item>
+                        <el-descriptions-item label="收衣门店">{{ orderClothItemVO ? orderClothItemVO.orgName : '' }} </el-descriptions-item>
+                        <el-descriptions-item label="状态">
+                            <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>
+                                </span>
+                            </template>
+                        </el-descriptions-item>
+                    </el-descriptions>
 
-          <el-descriptions title="衣物信息" :column="1">
-            <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">
-                <template v-for="(color,index) in orderClothItemVO.orderClothColors">
-                  {{index == 0?color.clothColorName:(',' + color.clothColorName)}}
-                </template>
-              </template>
-            </el-descriptions-item>
-            <el-descriptions-item label="瑕疵">
-              <template v-if="orderClothItemVO">
-                <template v-for="(color,index) in orderClothItemVO.orderClothFlaws">
-                  {{index == 0?color.clothFlawName:(',' + color.clothFlawName)}}
-                </template>
-              </template>
-            </el-descriptions-item>
-            <el-descriptions-item label="特殊处理">
-              <template v-if="orderClothItemVO">
-                <template v-for="(color,index) in orderClothItemVO.orderClothCrafts">
-                  {{index == 0?color.clothCraftName:(',' + color.clothCraftName)}}
-                </template>
-              </template>
-            </el-descriptions-item>
-            <el-descriptions-item label="附件">
-              <template v-if="orderClothItemVO">
-                <template v-for="(color,index) in orderClothItemVO.orderClothAdjuncts">
-                  {{index == 0?color.adjunctName:(',' + color.adjunctName)}}
-                </template>
-              </template>
-            </el-descriptions-item>
-            <el-descriptions-item label="收衣门店">{{orderClothItemVO?orderClothItemVO.orgName:''}}</el-descriptions-item>
-            <el-descriptions-item label="状态">
-              <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>
-                </span>
-              </template>
-            </el-descriptions-item>
-          </el-descriptions>
+                    <el-button type="primary" icon="el-icon-s-order" @click="showClothItemDetail">详情</el-button>
+                </el-card>
+            </el-col>
+        </el-row>
 
-          <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-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>
-        <el-descriptions-item label="天数">{{orderClothItemVO?orderClothItemVO.clothWashDayNum:''}}天</el-descriptions-item>
-        <el-descriptions-item label="总额">{{orderClothItemVO?orderClothItemVO.totalPrice:''}}元</el-descriptions-item>
-        <el-descriptions-item label="洗衣方式">{{orderClothItemVO?orderClothItemVO.clothWashModeName:''}}</el-descriptions-item>
-        <el-descriptions-item label="特殊处理">{{orderClothItemVO?orderClothItemVO.clothSpeedName:''}}</el-descriptions-item>
-        <el-descriptions-item label="是否保值">{{orderClothItemVO?(orderClothItemVO.isHedging == 'Y'?'是':'否'):''}}</el-descriptions-item>
-        <el-descriptions-item label="保值金额">{{orderClothItemVO?orderClothItemVO.hedgingPrice:''}}元</el-descriptions-item>
-        <el-descriptions-item label="颜色">
-          <template v-if="orderClothItemVO">
-            <template v-for="(color,index) in orderClothItemVO.orderClothColors">
-              {{index == 0?color.clothColorName:(',' + color.clothColorName)}}
-            </template>
-          </template>
-        </el-descriptions-item>
-        <el-descriptions-item label="瑕疵">
-          <template v-if="orderClothItemVO">
-            <template v-for="(color,index) in orderClothItemVO.orderClothFlaws">
-              {{index == 0?color.clothFlawName:(',' + color.clothFlawName)}}
-            </template>
-          </template>
-        </el-descriptions-item>
-        <el-descriptions-item label="特殊工艺">
-          <template v-if="orderClothItemVO">
-            <template v-for="(color,index) in orderClothItemVO.orderClothCrafts">
-              {{index == 0?color.clothCraftName:(',' + color.clothCraftName)}}
-            </template>
-          </template>
-        </el-descriptions-item>
-        <el-descriptions-item label="附件">
-          <template v-if="orderClothItemVO">
-            <template v-for="(color,index) in orderClothItemVO.orderClothAdjuncts">
-              {{index == 0?color.adjunctName:(',' + color.adjunctName)}}
-            </template>
-          </template>
-        </el-descriptions-item>
-      </el-descriptions>
-
-    </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-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-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>
-          </el-col>
-        </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-dialog>
-  </div>
+        <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>
+                <el-descriptions-item label="天数">{{ orderClothItemVO ? orderClothItemVO.clothWashDayNum : '' }}天 </el-descriptions-item>
+                <el-descriptions-item label="总额">{{ orderClothItemVO ? orderClothItemVO.totalPrice : '' }}元 </el-descriptions-item>
+                <el-descriptions-item label="洗衣方式">{{ orderClothItemVO ? orderClothItemVO.clothWashModeName : '' }} </el-descriptions-item>
+                <el-descriptions-item label="特殊处理">{{ orderClothItemVO ? orderClothItemVO.clothSpeedName : '' }} </el-descriptions-item>
+                <el-descriptions-item label="是否保值">
+                    {{ orderClothItemVO ? (orderClothItemVO.isHedging == 'Y' ? '是' : '否') : '' }}
+                </el-descriptions-item>
+                <el-descriptions-item label="保值金额">{{ orderClothItemVO ? orderClothItemVO.hedgingPrice : '' }}元 </el-descriptions-item>
+                <el-descriptions-item label="颜色">
+                    <template v-if="orderClothItemVO">
+                        <template v-for="(color, index) in orderClothItemVO.orderClothColors">
+                            {{ index == 0 ? color.clothColorName : ',' + color.clothColorName }}
+                        </template>
+                    </template>
+                </el-descriptions-item>
+                <el-descriptions-item label="瑕疵">
+                    <template v-if="orderClothItemVO">
+                        <template v-for="(color, index) in orderClothItemVO.orderClothFlaws">
+                            {{ index == 0 ? color.clothFlawName : ',' + color.clothFlawName }}
+                        </template>
+                    </template>
+                </el-descriptions-item>
+                <el-descriptions-item label="特殊工艺">
+                    <template v-if="orderClothItemVO">
+                        <template v-for="(color, index) in orderClothItemVO.orderClothCrafts">
+                            {{ index == 0 ? color.clothCraftName : ',' + color.clothCraftName }}
+                        </template>
+                    </template>
+                </el-descriptions-item>
+                <el-descriptions-item label="附件" v-if="orderClothItemVO && orderClothItemVO.isAdjunct == 'N'">
+                    <template v-if="orderClothItemVO">
+                        <template v-for="(color, index) in orderClothItemVO.orderClothAdjuncts">
+                            {{ index == 0 ? color.adjunctName : ',' + color.adjunctName }}
+                        </template>
+                    </template>
+                </el-descriptions-item>
+            </el-descriptions>
+        </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-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-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>
+                    </el-col>
+                </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-dialog>
+    </div>
 </template>
 
 <script>
-import { inFactory, deleteInFactory, setClothProblem } from "../../../api/order/clothItem";
-import { allWashProblem } from "@/api/cloth/washProblem";
-import order from "@/views/recharge/order/index.vue";
+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() {
-    return {
-      // 查询参数
-      queryParams: {
-      },
-      orderClothItemVO: null,
-      orderClothItemVOS: [],
-      clothItemDetailOpen: false,
-      washProblems: [],
-      selectClothWashProblemOpen: false,
-      selectClothItemIndex: null,
-      clothProblemContent: '',
-    }
-  },
-  created() {
-    allWashProblem().then(res => {
-      this.washProblems = res.data
-    })
-  },
-  methods: {
-    searchCloth() {
-      if (this.isEmpty(this.queryParams.washCode)) {
-        this.$message.error('请先输入衣服条码')
-        return
-      }
-      inFactory(this.queryParams).then(res => {
-        this.orderClothItemVO = res.data
-        this.orderClothItemVOS.push(res.data)
-      })
-    },
-    showClothItemDetail() {
-      this.clothItemDetailOpen = true
-    },
-    handleClose(done) {
-      this.$confirm('确认关闭?')
-        .then(_ => {
-          done();
-        })
-        .catch(_ => { });
+    name: 'InFactory',
+    computed: {},
+    dicts: ['sys_yes_no', 'cloth_type', 'cloth_send_type'],
+    data() {
+        return {
+            // 查询参数
+            queryParams: {},
+            orderClothItemVO: null,
+            orderClothItemVOS: [],
+            clothItemDetailOpen: false,
+            washProblems: [],
+            selectClothWashProblemOpen: false,
+            selectClothItemIndex: null,
+            clothProblemContent: ''
+        }
     },
-    rollbackOrderClothItem(index, washCode) {
-      this.$confirm('确定要删除这条入厂记录吗?')
-        .then(_ => {
-          deleteInFactory({ washCode: washCode }).then(res => {
-            this.orderClothItemVOS.splice(index, 1)
-          })
+    created() {
+        allWashProblem().then((res) => {
+            this.washProblems = res.data
         })
-        .catch(_ => { });
-
-    },
-    selectClothWashProblems(index) {
-      this.selectClothItemIndex = index
-      this.clothProblemContent = this.orderClothItemVOS[index].clothProblem
-      this.selectClothWashProblemOpen = true
-
-    },
-    addSelectWashProblem(row, column, cell, event) {
-      if (this.clothProblemContent == null) {
-        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 => {
-        this.orderClothItemVOS[this.selectClothItemIndex].clothProblem = this.clothProblemContent
-        this.selectClothWashProblemOpen = false
-        this.$message.success('设置成功')
-      })
     },
-    onOrderClothItemSelect(row) {
-      this.orderClothItemVO = row
-      this.queryParams.washCode = this.orderClothItemVO.washCode
+    methods: {
+        searchCloth() {
+            if (this.isEmpty(this.queryParams.washCode)) {
+                this.$message.error('请先输入衣服条码')
+                return
+            }
+            inFactory(this.queryParams).then((res) => {
+                this.orderClothItemVO = res.data
+                this.orderClothItemVOS.push(res.data)
+            })
+        },
+        showClothItemDetail() {
+            this.clothItemDetailOpen = true
+        },
+        handleClose(done) {
+            this.$confirm('确认关闭?')
+                .then((_) => {
+                    done()
+                })
+                .catch((_) => {})
+        },
+        rollbackOrderClothItem(index, washCode) {
+            this.$confirm('确定要删除这条入厂记录吗?')
+                .then((_) => {
+                    deleteInFactory({ washCode: washCode }).then((res) => {
+                        this.orderClothItemVOS.splice(index, 1)
+                    })
+                })
+                .catch((_) => {})
+        },
+        selectClothWashProblems(index) {
+            this.selectClothItemIndex = index
+            this.clothProblemContent = this.orderClothItemVOS[index].clothProblem
+            this.selectClothWashProblemOpen = true
+        },
+        addSelectWashProblem(row, column, cell, event) {
+            if (this.clothProblemContent == null) {
+                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) => {
+                this.orderClothItemVOS[this.selectClothItemIndex].clothProblem = this.clothProblemContent
+                this.selectClothWashProblemOpen = false
+                this.$message.success('设置成功')
+            })
+        },
+        onOrderClothItemSelect(row) {
+            this.orderClothItemVO = row
+            this.queryParams.washCode = this.orderClothItemVO.washCode
+        }
     }
-  }
 }
 </script>
 
-<style scoped>
-</style>
+<style scoped></style>

+ 170 - 166
src/views/order/cloth/outFactory.vue

@@ -1,179 +1,183 @@
 <template>
-  <div class="app-container">
-    <!-- 查询 -->
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <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-select>
-      </el-form-item>
-      <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-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-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" 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>
-              </template>
-            </el-table-column>
-            <el-table-column label="衣服名称" align="center" prop="name" width="250">
-              <template slot-scope="scope">
-                <span>{{scope.row.clothItemName}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="衣服品牌" align="center" prop="name" width="120">
-              <template slot-scope="scope">
-                <span>{{scope.row.clothBrandName}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="衣服颜色" align="center" prop="name" width="150">
-              <template slot-scope="scope">
-                <template v-for="(item,index) in scope.row.orderClothColors">
-                  {{index == 0?item.clothColorName:(',' + item.clothColorName)}}
-                </template>
-              </template>
-            </el-table-column>
-            <el-table-column label="衣服瑕疵" align="center" prop="name">
-              <template slot-scope="scope">
-                <span>
-                  <template v-for="(item,index) in scope.row.orderClothFlaws">
-                    {{index == 0?item.clothFlawName:(',' + item.clothFlawName)}}
-                  </template>
-                </span>
-              </template>
-            </el-table-column>
-            <el-table-column label="送返门店" align="center" prop="storeName">
-              <template slot-scope="scope">
-                <span v-if="scope.row.sourceType == '01'">工厂</span>
-                <span v-else>{{scope.row.storeName}}</span>
-              </template>
-            </el-table-column>
-            <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>
-                </span>
-              </template>
-            </el-table-column>
-            <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>
-                <span v-if="scope.row.flowStatus == '2'">已检查</span>
-                <span v-if="scope.row.flowStatus == '3'">已出厂</span>
-                <span v-if="scope.row.flowStatus == '100'">重洗</span>
-              </template>
-            </el-table-column>
-          </el-table>
-
-          <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
-        </div>
-      </el-col>
-    </el-row>
-  </div>
+    <div class="app-container">
+        <!-- 查询 -->
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+            <el-form-item prop="brandId">
+                <el-select v-model="queryParams.orgId" placeholder="请选择门店" clearable filterable>
+                    <el-option v-for="org in orgList" :key="org.id" :label="org.name" :value="org.id" />
+                </el-select>
+            </el-form-item>
+            <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-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-col>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+        <el-tabs v-model="queryParams.clothType" @tab-click="handleQuery">
+            <el-tab-pane label="衣服" name="1"></el-tab-pane>
+            <el-tab-pane label="附件" name="2"></el-tab-pane>
+        </el-tabs>
+        <el-row :gutter="20">
+            <el-col :span="24" :xs="24">
+                <div style="width: 100%" class="verticle-view">
+                    <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>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="衣服名称" align="center" prop="name" width="250">
+                            <template slot-scope="scope">
+                                <span>{{ scope.row.clothItemName }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="衣服品牌" align="center" prop="name" width="120">
+                            <template slot-scope="scope">
+                                <span>{{ scope.row.clothBrandName }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="衣服颜色" align="center" prop="name" width="150">
+                            <template slot-scope="scope">
+                                <template v-for="(item, index) in scope.row.orderClothColors">
+                                    {{ index == 0 ? item.clothColorName : ',' + item.clothColorName }}
+                                </template>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="衣服瑕疵" align="center" prop="name">
+                            <template slot-scope="scope">
+                                <span>
+                                    <template v-for="(item, index) in scope.row.orderClothFlaws">
+                                        {{ index == 0 ? item.clothFlawName : ',' + item.clothFlawName }}
+                                    </template>
+                                </span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="送返门店" align="center" prop="storeName">
+                            <template slot-scope="scope">
+                                <span>{{ scope.row.orgName }}</span>
+                            </template>
+                        </el-table-column>
+                        <!--                        <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>-->
+                        <!--                                </span>-->
+                        <!--                            </template>-->
+                        <!--                        </el-table-column>-->
+                        <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>
+                                <span v-if="scope.row.flowStatus == '2'">已检查</span>
+                                <span v-if="scope.row.flowStatus == '3'">已出厂</span>
+                                <span v-if="scope.row.flowStatus == '100'">重洗</span>
+                            </template>
+                        </el-table-column>
+                    </el-table>
 
+                    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+                </div>
+            </el-col>
+        </el-row>
+    </div>
 </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() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-      },
-      orgList: [],
-      orderClothItemVOS: [],
-      total: 0,
-    }
-  },
-  created() {
-    allOrg({ sourceType: '02' }).then(res => {
-      this.orgList = res.data
-    })
-    this.getList();
-  },
-  methods: {
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.ids = []
-      this.queryParams.pageNum = 1;
-      this.$refs.table.clearSelection()
-      this.$forceUpdate()
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
+    name: 'InFactory',
+    computed: {},
+    dicts: ['sys_yes_no', 'cloth_type', 'cloth_send_type'],
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 20,
+                clothType: '1'
+            },
+            orgList: [],
+            orderClothItemVOS: [],
+            total: 0
+        }
     },
-    showClothItemDetail() {
-      this.clothItemDetailOpen = true
+    created() {
+        allOrg({ sourceType: '02' }).then((res) => {
+            this.orgList = res.data
+        })
+        this.getList()
     },
-    getList() {
-      findOutFactoryPageByFlowStatus(this.queryParams).then(res => {
-        this.orderClothItemVOS = res.data.records
-        this.total = res.data.total
-      })
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    onOutFactoryClick() {
-      if (this.ids.length == 0) {
-        this.$message.error('请先选择出厂的衣服')
-        return
-      }
-      this.$modal.confirm('确定要对这些衣服进行出厂处理吗?').then(() => {
-        return outFactory({ ids: this.ids })
-      }).then(res => {
-        this.$message.success('出厂成功')
-        this.handleQuery()
-      }).catch(() => { });
-
+    methods: {
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.ids = []
+            this.queryParams.pageNum = 1
+            this.$refs.table.clearSelection()
+            this.$forceUpdate()
+            this.getList()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
+        showClothItemDetail() {
+            this.clothItemDetailOpen = true
+        },
+        getList() {
+            findOutFactoryPageByFlowStatus(this.queryParams).then((res) => {
+                this.orderClothItemVOS = res.data.records
+                this.total = res.data.total
+            })
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map((item) => item.id)
+            this.single = selection.length !== 1
+            this.multiple = !selection.length
+        },
+        onOutFactoryClick() {
+            if (this.ids.length == 0) {
+                this.$message.error('请先选择出厂的衣服')
+                return
+            }
+            this.$modal
+                .confirm('确定要对这些衣服进行出厂处理吗?')
+                .then(() => {
+                    return outFactory({ ids: this.ids, clothType: this.queryParams.clothType })
+                })
+                .then((res) => {
+                    this.$message.success('出厂成功')
+                    this.handleQuery()
+                })
+                .catch(() => {})
+        }
     }
-  }
 }
 </script>
 
-<style scoped>
-</style>
+<style scoped></style>

+ 13 - 2
src/views/order/cloth/searchCloth.vue

@@ -119,7 +119,7 @@
                         </el-descriptions-item>
                         <el-descriptions-item>
                             <template slot="label"> 附件 </template>
-                            <el-tag size="small" v-for="(item, index) in form.orderClothAdjuncts" :key="index" style="margin-right: 10px; margin-bottom: 2.5px; margin-top: 2.5px">{{ item.adjunctName + '*' + item.num }}</el-tag>
+                            <el-tag size="small" v-for="(item, index) in form.orderClothAdjuncts" :key="index" style="margin-right: 10px; margin-bottom: 2.5px; margin-top: 2.5px">{{ item.adjunctName }}</el-tag>
                         </el-descriptions-item>
                         <el-descriptions-item>
                             <template slot="label"> 挂衣号 </template>
@@ -140,7 +140,18 @@
                     </el-descriptions>
                 </el-col>
                 <el-col :span="24" style="margin-top: 10px">
-                    <el-table :data="flowRecords">
+                    <el-table :data="form.orderClothAdjuncts" :v-if="form.orderClothAdjuncts" fit highlight-current-row border stripe>
+                        <el-table-column label="附件条码" align="center" prop="adjunctNo" />
+                        <el-table-column label="附件名称" align="center" prop="adjunctName" />
+                        <el-table-column label="附件状态" align="center" prop="flowStatus">
+                            <template slot-scope="scope">
+                                <dict-tag :options="dict.type.order_cloth_flow_action" :value="scope.row.flowStatus" />
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </el-col>
+                <el-col :span="24" style="margin-top: 10px">
+                    <el-table :data="flowRecords" fit highlight-current-row border stripe>
                         <el-table-column label="操作" align="center">
                             <template slot-scope="scope">
                                 <dict-tag :options="dict.type.order_cloth_flow_action" :value="scope.row.flowStatus" />