大大的豆芽 11 сар өмнө
parent
commit
ef08e5f1fa

+ 0 - 1
src/views/cloth/adjunct/index.vue

@@ -26,7 +26,6 @@
         </el-row>
 
         <Page uri="/mapi/cloth/adjunct/list" :request-params="queryParams" ref="pagination">
-            <el-table-column label="ID" align="center" prop="id" />
             <el-table-column label="编号" align="center" prop="code" />
             <el-table-column label="名称" align="center" prop="name" />
             <el-table-column label="状态" align="center" prop="status">

+ 4 - 2
src/views/cloth/craft/index.vue

@@ -49,7 +49,7 @@
                             <el-input v-model="form.craftName" placeholder="请输入工艺名称" />
                         </el-form-item>
                         <el-form-item label="显示顺序" prop="sort">
-                            <el-input-number v-model="form.sort" placeholder="请输入显示顺序(升序排列显示)" :min="0" :max="9999" :step-strictly="true" :style="{ width: '100%' }"> </el-input-number>
+                            <el-input-number v-model="form.sort" placeholder="请输入显示顺序(升序排列显示)" :min="0" :max="9999" :style="{ width: '100%' }"> </el-input-number>
                         </el-form-item>
                         <el-form-item label="状态">
                             <el-radio-group v-model="form.status">
@@ -100,7 +100,9 @@ export default {
                 status: null
             },
             // 表单参数
-            form: {},
+            form: {
+                sort: 1
+            },
             // 表单校验
             rules: {}
         }

+ 3 - 4
src/views/cloth/flaw/index.vue

@@ -47,15 +47,14 @@
         <el-dialog :title="title" :visible.sync="open" direction="rtl" size="30%" append-to-body @opened="onDialogOpened" destroy-on-close>
             <el-row :gutter="15">
                 <el-form ref="form" :model="form" :rules="rules" size="medium" label-width="100px">
-                    <el-form-item label="瑕疵名称" prop="name">
-                        <el-input v-model="form.name" placeholder="请输入衣服瑕疵名称" />
-                    </el-form-item>
-
                     <el-form-item label="瑕疵类型" prop="type">
                         <el-select v-model="form.flawTypeId" placeholder="瑕疵类型" clearable :style="{ width: '100%' }">
                             <el-option v-for="(item, index) in flawTypeList" :key="index" :label="item.name" :value="item.id"></el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item label="瑕疵名称" prop="name">
+                        <el-input v-model="form.name" placeholder="请输入衣服瑕疵名称" />
+                    </el-form-item>
 
                     <el-form-item label="显示顺序" prop="sort">
                         <el-input-number v-model="form.sort" placeholder="请输入显示顺序(升序排列显示)" :min="0" :step-strictly="true" :style="{ width: '100%' }"> </el-input-number>

+ 0 - 1
src/views/cloth/texture/index.vue

@@ -26,7 +26,6 @@
         </el-row>
 
         <Page uri="/mapi/cloth/texture/list" :request-params="queryParams" ref="pagination">
-            <el-table-column label="ID" align="center" prop="id" />
             <el-table-column label="编号" align="center" prop="code" />
             <el-table-column label="名称" align="center" prop="name" />
             <el-table-column label="状态" align="center" prop="status">

+ 4 - 2
src/views/cloth/washMode/index.vue

@@ -68,7 +68,7 @@
                         <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
                         <div style="margin-top: 20px"></div>
                         <el-checkbox-group v-model="selectClothTypeList" @change="handleCheckedClothTypeChange">
-                            <el-checkbox v-for="item in allClothTypeList" style="height: 50px" :label="item.id" :key="item.id">{{ item.name }}</el-checkbox>
+                            <el-checkbox v-for="item in allClothTypeList" style="height: 50px" :label="item.id" :key="item.id+''">{{ item.name }}</el-checkbox>
                         </el-checkbox-group>
                     </div>
                 </el-form-item>
@@ -299,7 +299,9 @@ export default {
             this.relationOpen = false
         },
         handleCheckAllChange(val) {
-            this.selectClothTypeList = val ? this.allClothTypeList : []
+            let ids = this.allClothTypeList.map((item) => item.id)
+            this.selectClothTypeList = val ? ids : []
+            console.log(this.selectClothTypeList)
             this.isIndeterminate = false
         },
         handleCheckedClothTypeChange(value) {