|
|
@@ -29,7 +29,9 @@
|
|
|
<div>价格：{{item.price}}</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="myFont">{{ item.sales_remark }}</div>
|
|
|
+ <el-tooltip class="item" effect="dark" :content="item.sales_remark" placement="top">
|
|
|
+ <div class="myFont"><span style="font-size: 11px">{{ item.sales_remark }}</span></div>
|
|
|
+ </el-tooltip>
|
|
|
<el-row>
|
|
|
<el-col :span="12">
|
|
|
<template v-if="boolFounder || permissions.filter(p => p === 'pjTech' || p === 'pjOrderItemsList').length > 0">
|
|
|
@@ -50,6 +52,12 @@
|
|
|
<div>硬件版本：<el-input v-model="item.hard_ver" size="small"></el-input></div>
|
|
|
<div>软件版本：<el-input v-model="item.soft_ver" size="small"></el-input></div>
|
|
|
<div>备注：<el-input type="textarea" rows="3" placeholder="备注，最大150字" maxlength="150" show-word-limit v-model="item.tech_remark"></el-input></div>
|
|
|
+ <div @click="clickImg(index, 1)">
|
|
|
+ <el-upload :action="`${MixinUploadApi}?scene=pjorders`" :file-list="getImg(item.name, item.tech_img)" :on-preview="handlePictureCardPreview" :before-upload="beforeAvatarUpload"
|
|
|
+ :on-success="handleImageSuccess" :on-remove="handleRemove" :on-exceed="handleExceed" :limit="1">
|
|
|
+ <el-button v-if="!item.tech_img" size="small" type="primary">点击上传</el-button>
|
|
|
+ </el-upload>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</template>
|
|
|
<template v-else>
|
|
|
@@ -75,6 +83,11 @@
|
|
|
<div>备注：<el-tooltip class="item" effect="dark" :content="item.tech_remark" placement="top">
|
|
|
<span style="font-size: 11px">{{item.tech_remark}}</span>
|
|
|
</el-tooltip></div>
|
|
|
+ <div v-if="item.tech_img">
|
|
|
+ <el-upload :action="`${MixinUploadApi}?scene=pjorders`" :file-list="getImg(item.name, item.tech_img)" :on-preview="handlePictureCardPreview" :before-upload="beforeAvatarUpload"
|
|
|
+ :on-success="handleImageSuccess" :on-remove="handleRemove" :on-exceed="handleExceed" disabled:limit="1">
|
|
|
+ </el-upload>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-col>
|
|
|
@@ -106,7 +119,7 @@
|
|
|
<el-option value="完成"></el-option>
|
|
|
</el-select>
|
|
|
</div>
|
|
|
- <div @click="clickImg(index)">
|
|
|
+ <div @click="clickImg(index, 2)">
|
|
|
<el-upload :action="`${MixinUploadApi}?scene=pjorders`" :file-list="getImg(item.name, item.produce_img)" :on-preview="handlePictureCardPreview" :before-upload="beforeAvatarUpload"
|
|
|
:on-success="handleImageSuccess" :on-remove="handleRemove" :on-exceed="handleExceed" :limit="1">
|
|
|
<el-button v-if="!item.produce_img" size="small" type="primary">点击上传</el-button>
|
|
|
@@ -137,7 +150,7 @@
|
|
|
<span style="font-size: 11px">{{ item.produced_remark }}</span>
|
|
|
</el-tooltip></div>
|
|
|
<div>生产状态：<span style="font-size: 11px">{{ item.produce_status }}</span></div>
|
|
|
- <div @click="clickImg(index)">
|
|
|
+ <div v-if="item.produce_img">
|
|
|
<el-upload :action="`${MixinUploadApi}?scene=pjorders`" :file-list="getImg(item.name, item.produce_img)" :on-preview="handlePictureCardPreview" :before-upload="beforeAvatarUpload"
|
|
|
:on-success="handleImageSuccess" :on-remove="handleRemove" :on-exceed="handleExceed" disabled :limit="1">
|
|
|
</el-upload>
|
|
|
@@ -173,7 +186,9 @@
|
|
|
<div>价格：{{item.price}}</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="myFont">{{ item.sales_remark }}</div>
|
|
|
+ <el-tooltip class="item" effect="dark" :content="item.sales_remark" placement="top">
|
|
|
+ <div class="myFont"><span style="font-size: 11px">{{ item.sales_remark }}</span></div>
|
|
|
+ </el-tooltip>
|
|
|
<el-row>
|
|
|
<el-col :span="12">
|
|
|
<template v-if="boolFounder || permissions.filter(p => p === 'pjTech' || p === 'pjOrderItemsList').length > 0">
|
|
|
@@ -194,6 +209,12 @@
|
|
|
<div>硬件版本：<el-input v-model="item.hard_ver" size="small"></el-input></div>
|
|
|
<div>软件版本：<el-input v-model="item.soft_ver" size="small"></el-input></div>
|
|
|
<div>备注：<el-input type="textarea" rows="3" placeholder="备注，最大150字" maxlength="150" show-word-limit v-model="item.tech_remark"></el-input></div>
|
|
|
+ <div @click="clickImg(index, 1)">
|
|
|
+ <el-upload :action="`${MixinUploadApi}?scene=pjorders`" :file-list="getImg(item.name, item.tech_img)" :on-preview="handlePictureCardPreview" :before-upload="beforeAvatarUpload"
|
|
|
+ :on-success="handleImageSuccess" :on-remove="handleRemove" :on-exceed="handleExceed" :limit="1">
|
|
|
+ <el-button v-if="!item.tech_img" size="small" type="primary">点击上传</el-button>
|
|
|
+ </el-upload>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</template>
|
|
|
<template v-else>
|
|
|
@@ -219,6 +240,11 @@
|
|
|
<div>备注：<el-tooltip class="item" effect="dark" :content="item.tech_remark" placement="top">
|
|
|
<span style="font-size: 11px">{{item.tech_remark}}</span>
|
|
|
</el-tooltip></div>
|
|
|
+ <div v-if="item.tech_img">
|
|
|
+ <el-upload :action="`${MixinUploadApi}?scene=pjorders`" :file-list="getImg(item.name, item.tech_img)" :on-preview="handlePictureCardPreview" :before-upload="beforeAvatarUpload"
|
|
|
+ :on-success="handleImageSuccess" :on-remove="handleRemove" :on-exceed="handleExceed" disabled:limit="1">
|
|
|
+ </el-upload>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-col>
|
|
|
@@ -250,7 +276,7 @@
|
|
|
<el-option value="完成"></el-option>
|
|
|
</el-select>
|
|
|
</div>
|
|
|
- <div @click="clickImg(index)">
|
|
|
+ <div @click="clickImg(index, 2)">
|
|
|
<el-upload :action="`${MixinUploadApi}?scene=pjorders`" :file-list="getImg(item.name, item.produce_img)" :on-preview="handlePictureCardPreview" :before-upload="beforeAvatarUpload"
|
|
|
:on-success="handleImageSuccess" :on-remove="handleRemove" :on-exceed="handleExceed" :limit="1">
|
|
|
<el-button v-if="!item.produce_img" size="small" type="primary">点击上传</el-button>
|
|
|
@@ -281,7 +307,7 @@
|
|
|
<span style="font-size: 11px">{{ item.produced_remark }}</span>
|
|
|
</el-tooltip></div>
|
|
|
<div>生产状态：<span style="font-size: 11px">{{ item.produce_status }}</span></div>
|
|
|
- <div @click="clickImg(index)">
|
|
|
+ <div v-if="item.produce_img">
|
|
|
<el-upload :action="`${MixinUploadApi}?scene=pjorders`" :file-list="getImg(item.name, item.produce_img)" :on-preview="handlePictureCardPreview" :before-upload="beforeAvatarUpload"
|
|
|
:on-success="handleImageSuccess" :on-remove="handleRemove" :on-exceed="handleExceed" disabled :limit="1">
|
|
|
</el-upload>
|
|
|
@@ -297,7 +323,7 @@
|
|
|
</el-tab-pane>
|
|
|
<el-tab-pane label="表格">
|
|
|
<el-table :data="listData" stripe style="width: 100%;">
|
|
|
- <el-table-column prop="name" label="名称"></el-table-column>
|
|
|
+ <el-table-column prop="name" show-overflow-tooltip label="名称" min-width="140"></el-table-column>
|
|
|
<el-table-column label="基础件?">
|
|
|
<template slot-scope="scope">
|
|
|
<el-tag type="success" v-if="scope.row.type_base">标准件</el-tag>
|
|
|
@@ -315,8 +341,10 @@
|
|
|
<span>{{ scope.row.qty - scope.row.produced_qty}}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column prop="shipped_qty" label="已发数量" width="100"></el-table-column>
|
|
|
<el-table-column prop="price" label="价格" width="100"></el-table-column>
|
|
|
<el-table-column prop="sales_remark" show-overflow-tooltip label="销售备注"></el-table-column>
|
|
|
+ <el-table-column prop="produced_remark" show-overflow-tooltip label="生产备注"></el-table-column>
|
|
|
</el-table>
|
|
|
<div style="margin-top: 20px">
|
|
|
<el-button type="primary" @click="outExcel">导出Excel</el-button>
|
|
|
@@ -375,6 +403,7 @@ export default {
|
|
|
dialogImageUrl: '',
|
|
|
changeId: null,
|
|
|
index: 0,
|
|
|
+ imgType: 1,
|
|
|
goodsSelectVisible: false,
|
|
|
type_base: true
|
|
|
}
|
|
|
@@ -477,19 +506,28 @@ export default {
|
|
|
/** 文件列表上传成功时的钩子 上传成功校验 */
|
|
|
async handleImageSuccess(response, file) {
|
|
|
if (file.status === 'success') {
|
|
|
- this.$set(this.baseDevice[this.index], 'produce_img', response.url)
|
|
|
+ if (this.imgType === 1) {
|
|
|
+ this.$set(this.baseDevice[this.index], 'tech_img', response.url)
|
|
|
+ } else {
|
|
|
+ this.$set(this.baseDevice[this.index], 'produce_img', response.url)
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
handleRemove(e) {
|
|
|
setTimeout(() => {
|
|
|
- this.$set(this.baseDevice[this.index], 'produce_img', null)
|
|
|
+ if (this.imgType === 1) {
|
|
|
+ this.$set(this.baseDevice[this.index], 'tech_img', null)
|
|
|
+ } else {
|
|
|
+ this.$set(this.baseDevice[this.index], 'produce_img', null)
|
|
|
+ }
|
|
|
}, 400)
|
|
|
},
|
|
|
handleExceed(e) {
|
|
|
this.$message.error('最多只能上传一个文件！')
|
|
|
},
|
|
|
- clickImg(index) {
|
|
|
+ clickImg(index, type) {
|
|
|
this.index = index
|
|
|
+ this.imgType = type
|
|
|
},
|
|
|
changeEdit(item) {
|
|
|
this.changeId = item.id
|
wenningning