|
@@ -127,12 +127,19 @@
|
|
<span slot="imageslot">
|
|
<span slot="imageslot">
|
|
<a>查看</a>
|
|
<a>查看</a>
|
|
</span>
|
|
</span>
|
|
|
|
+ <!--附件-->
|
|
|
|
+ <span slot="accessory" slot-scope="text, record">
|
|
|
|
+ <a-button type="primary" @click="openItemOnclosure(record)" >附件</a-button>
|
|
|
|
+ </span>
|
|
|
|
+
|
|
</a-table>
|
|
</a-table>
|
|
</a-card>
|
|
</a-card>
|
|
|
|
|
|
<!-- 单个订单报表 抽屉 -->
|
|
<!-- 单个订单报表 抽屉 -->
|
|
<salesOrderDetails-drawer ref="salesOrderDetailsDrawer" @ok="modalFormOk"></salesOrderDetails-drawer>
|
|
<salesOrderDetails-drawer ref="salesOrderDetailsDrawer" @ok="modalFormOk"></salesOrderDetails-drawer>
|
|
<imgModal ref="imgdetal"></imgModal>
|
|
<imgModal ref="imgdetal"></imgModal>
|
|
|
|
+ <!-- 附件 -->
|
|
|
|
+ <attachment-display ref="attachmentDisplay"></attachment-display>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
@@ -140,7 +147,7 @@
|
|
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
|
|
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
|
|
import JEllipsis from '@/components/jeecg/JEllipsis'
|
|
import JEllipsis from '@/components/jeecg/JEllipsis'
|
|
import moment from 'moment'
|
|
import moment from 'moment'
|
|
-
|
|
|
|
|
|
+import AttachmentDisplay from '@views/reportForms/pro-progress-report/attachment-display.vue'
|
|
import salesOrderDetailsDrawer from '@views/reportForms/pro-progress-report/salesOrderDetailsDrawer.vue'
|
|
import salesOrderDetailsDrawer from '@views/reportForms/pro-progress-report/salesOrderDetailsDrawer.vue'
|
|
import imgModal from '@views/reportForms/full-rate-table/progtressImg.vue'
|
|
import imgModal from '@views/reportForms/full-rate-table/progtressImg.vue'
|
|
import { proProgressList, getImg } from '@api/reportForms/pro-progress-report.js'
|
|
import { proProgressList, getImg } from '@api/reportForms/pro-progress-report.js'
|
|
@@ -148,7 +155,7 @@ import { proProgressList, getImg } from '@api/reportForms/pro-progress-report.js
|
|
export default {
|
|
export default {
|
|
name: 'ProProgressReport', // 生产进度报表
|
|
name: 'ProProgressReport', // 生产进度报表
|
|
mixins: [JeecgListMixin],
|
|
mixins: [JeecgListMixin],
|
|
- components: { JEllipsis, moment, salesOrderDetailsDrawer,imgModal },
|
|
|
|
|
|
+ components: { JEllipsis, moment, salesOrderDetailsDrawer,imgModal,AttachmentDisplay },
|
|
|
|
|
|
data() {
|
|
data() {
|
|
let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} />
|
|
let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} />
|
|
@@ -248,7 +255,7 @@ export default {
|
|
className: 'replacecolor',
|
|
className: 'replacecolor',
|
|
scopedSlots: { customRender: 'imageslot' }
|
|
scopedSlots: { customRender: 'imageslot' }
|
|
},
|
|
},
|
|
- { title: '附件', width: 70, dataIndex: 'accessory', className: 'replacecolor' }
|
|
|
|
|
|
+ { title: '附件', width: 100, dataIndex: 'accessory', className: 'replacecolor',scopedSlots: { customRender: 'accessory' } }
|
|
],
|
|
],
|
|
proProgressData: [], //生产进度数据
|
|
proProgressData: [], //生产进度数据
|
|
loading: false, // 表格加载
|
|
loading: false, // 表格加载
|
|
@@ -282,7 +289,9 @@ export default {
|
|
// 分页查询 生产进度列表
|
|
// 分页查询 生产进度列表
|
|
getproProgressList() {
|
|
getproProgressList() {
|
|
this.$nextTick(() => {
|
|
this.$nextTick(() => {
|
|
|
|
+ this.loading = true
|
|
proProgressList(this.queryParam).then(res => {
|
|
proProgressList(this.queryParam).then(res => {
|
|
|
|
+ this.loading = false
|
|
if (res.success) {
|
|
if (res.success) {
|
|
this.proProgressData = res.result.records
|
|
this.proProgressData = res.result.records
|
|
console.log('生产进度列表页', this.proProgressData)
|
|
console.log('生产进度列表页', this.proProgressData)
|
|
@@ -362,6 +371,18 @@ export default {
|
|
this.cSOCode = []
|
|
this.cSOCode = []
|
|
// this.getproProgressList()
|
|
// this.getproProgressList()
|
|
},
|
|
},
|
|
|
|
+ // 附件
|
|
|
|
+ openItemOnclosure(record){
|
|
|
|
+ var attachList = [];
|
|
|
|
+ record.accessorItemList.forEach(e=>{
|
|
|
|
+ var attach = {};
|
|
|
|
+ attach.name = e.filename;
|
|
|
|
+ attach.src=e.fileurl;
|
|
|
|
+ attachList.push(attach);
|
|
|
|
+ });
|
|
|
|
+ this.$refs.attachmentDisplay.AttachmentModVis = true
|
|
|
|
+ this.$refs.attachmentDisplay.attachmentData = attachList;
|
|
|
|
+ },
|
|
|
|
|
|
// 分页变化时触发
|
|
// 分页变化时触发
|
|
handleTableChange(pagination, filters, sorter) {
|
|
handleTableChange(pagination, filters, sorter) {
|