chenrui 11 kuukautta sitten
vanhempi
commit
d4b70d7099

+ 5 - 4
src/views/purchasingManagement/purchaseReceipt/detailModal.vue

@@ -135,18 +135,19 @@ export default {
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: '15%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', width: '40%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '单位', dataIndex: 'unit', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '采购数量', dataIndex: 'productQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
         // { title: '采购单价', dataIndex: 'productCost', width: '10%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         // { title: '采购金额', dataIndex: 'subtotal', width: '10%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') }
       ]
+      if (this.$hasPermissions('B_purchaseReceiptDetail_costPrice')) { //  成本价权限
+        arr.splice(6, 0, { title: '采购单价', dataIndex: 'productCost', width: '10%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.splice(7, 0, { title: '采购金额', dataIndex: 'subtotal', width: '10%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+      }
       if (this.basicInfoData && this.basicInfoData.state && this.basicInfoData.state === 'FINISH') {
         arr.push({ title: '唯一码', dataIndex: 'action', width: '10%', align: 'center', scopedSlots: { customRender: 'action' } })
       }
-      if (this.$hasPermissions('B_purchaseReceiptDetail_costPrice')) { //  成本价权限
-        arr.splice(5, 0, { title: '采购单价', dataIndex: 'productCost', width: '10%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
-        arr.splice(6, 0, { title: '采购金额', dataIndex: 'subtotal', width: '10%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
-      }
       return arr
     }
   },

+ 6 - 2
src/views/purchasingManagement/purchaseReceipt/seeVoucherModal.vue

@@ -7,9 +7,9 @@
     title="查看支付凭证"
     v-model="isShow"
     @cancel="isShow=false"
-    :width="500">
+    :width="600">
     <div class="seeVoucher-con">
-      <div v-if="itemData&&itemData.length>0">
+      <div v-if="itemData&&itemData.length>0" class="seeVoucher-main">
         <div v-for="item in itemData" :key="item.id" style="margin-bottom: 10px;">
           <a class="link-bule" v-if="item.extName!=('jpg'||'jpeg'||'png')" :href="item.filePath">
             <a-icon type="download" style="padding-right: 5px;" />{{ item.fileName }}
@@ -70,6 +70,10 @@ export default {
 <style lang="less" scoped>
   .seeVoucher-modal{
     .seeVoucher-con{
+      .seeVoucher-main{
+        max-height: 600px;
+        overflow-y: scroll;
+      }
      .btn-con{
        margin: 10px 0 20px;
        text-align: center;

+ 1 - 1
src/views/purchasingManagement/purchaseReceipt/uploadVoucherModal.vue

@@ -83,7 +83,7 @@ export default {
         sparePartsSn: this.itemSn,
         attachmentList: this.attachList
       }).then(res => {
-        if (res.code == 200) {
+        if (res.status == 200) {
           this.$message.success('上传成功')
           this.$emit('ok')
           this.isShow = false