Compare commits

..

6 Commits

Author SHA1 Message Date
60fb71791a update dashborad number to string 2022-03-11 10:37:20 +08:00
27786fb197 Merge pull request 'update dashboard' (#41) from gtz into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #41
2022-03-08 14:35:40 +08:00
9f42c5e33e Merge pull request '更新工艺' (#40) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #40
2022-03-08 09:11:55 +08:00
zwq
a2adcc0fd3 更新工艺 2022-03-08 09:11:34 +08:00
0c0679cb1e Merge pull request '更新工艺' (#39) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #39
2022-03-08 09:02:19 +08:00
zwq
4743fdc191 更新工艺 2022-03-08 09:01:47 +08:00
3 changed files with 9 additions and 18 deletions

View File

@ -32,7 +32,7 @@
/>
</el-select>
</el-form-item> -->
<el-form-item v-if="false" :label="$t('module.art.artBOM')" prop="bomId">
<!-- <el-form-item v-if="false" :label="$t('module.art.artBOM')" prop="bomId">
<el-select
v-model="obj.bomId"
:class="$style.select"
@ -47,7 +47,7 @@
:value="item.id"
/>
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item :label="$t('module.art.description')" prop="description">
<el-input v-model="obj.description" />
</el-form-item>
@ -63,7 +63,7 @@
</template>
<script>
import { add, update, getInfo, listSubstrate, listBom, getCode } from '@/api/art-manage/art.js'
import { add, update, getInfo, getCode } from '@/api/art-manage/art.js'
import SubmitBar from '@/views/art/components/submit-bar'
export default {
@ -91,8 +91,6 @@ export default {
substrateId: '',
bomId: ''
},
substrateList: [],
bomList: [],
rules: {
name: [
{ required: true, message: this.$t('module.art.artName') + this.$t('module.art.notNull'), trigger: 'blur' },
@ -129,14 +127,6 @@ export default {
},
methods: {
init: async function() {
if (this.substrateList.length === 0) {
const substrateRes = await listSubstrate()
this.substrateList = substrateRes.data
}
if (this.bomList.length === 0) {
const bomRes = await listBom()
this.bomList = bomRes.data
}
if (this.id) {
const res = await getInfo({ id: this.id })
this.obj = res.data

View File

@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2022-03-03 09:16:10
* @LastEditors: gtz
* @LastEditTime: 2022-03-08 14:34:24
* @LastEditTime: 2022-03-11 09:06:18
* @Description: file content
* @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue
-->
@ -41,7 +41,7 @@
</el-col>
</el-row>
<div class="dashboard-layout-footer">
{{ '第' + (index + 1) + '排(' + ((current - 1) * 4 + item) + ')' }}
{{ '第' + rowIndex[index] + '排(' + ((current - 1) * 4 + item) + ')' }}
</div>
</el-col>
</el-row>
@ -68,7 +68,7 @@
</el-col>
</el-row>
<div class="dashboard-layout-footer">
{{ '第' + (index + 1) + '排(' + ((current - 1) * 4 + item) + ')' }}
{{ '第' + rowIndex[index] + '排(' + ((current - 1) * 4 + item) + ')' }}
</div>
</el-col>
</el-row>

View File

@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2022-03-03 15:47:47
* @LastEditors: gtz
* @LastEditTime: 2022-03-07 20:41:47
* @LastEditTime: 2022-03-11 09:05:55
* @Description: file content
* @FilePath: \mt-ck-wms-ui\src\views\dashboard\testdata.js
*/
@ -2949,5 +2949,6 @@ export default {
4: '#FFA08F'
},
current: 1,
totalPage: 1
totalPage: 1,
rowIndex: ['一', '二']
}