托书国外结汇发票

src/views/book/book-list.vue

@@ -375,7 +375,7 @@ export default {
          var exinvoiceArr = ["-报关资料"]
        }
     }else{//
-      var exinvoiceArr = ["国外-报关信息-装箱单","国外-报关信息-发票","国外-报关信息-托书"]
+      var exinvoiceArr = ["国外-报关信息-装箱单","国外-报关信息-发票","国外-报关信息-托书","-结汇发票"]
     }
        
        exinvoiceArr.map(item =>{

src/views/reportForms/pro-progress-report/salesOrderDetailsDrawer.vue

@@ -7,6 +7,17 @@
         <div class="table-page-search-wrapper">
           <a-form layout="inline">
             <a-row :gutter="24">
+              <a-col :md="6" :sm="8">
+                <a-form-item label="销售订单号">
+                  {{ salesOrderMain.csocode }}
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="8">
+                <a-form-item label="款号">
+                  {{ salesOrderMain.itemNumber }}
+                </a-form-item>
+              </a-col>
+
               <a-col :md="6" :sm="8">
                 <a-form-item label="部门">
                   {{ salesOrderMain.cdepName }}
@@ -24,92 +35,97 @@
                   {{ salesOrderMain.ccusName }}
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="8">
-                <a-form-item label="物料编码">
+              <!-- <a-col :md="6" :sm="8">
+                <a-form-item label="物料">
                   {{ salesOrderMain.cinvCode }}
                 </a-form-item>
-              </a-col>
+              </a-col> -->
 
-              <a-col :md="12" :sm="12">
+              <a-col :md="6" :sm="8">
                 <a-form-item label="物料名称">
                   {{ salesOrderMain.cinvName }}
                 </a-form-item>
               </a-col>
-
               <a-col :md="6" :sm="8">
-                <a-form-item label="款号">
-                  {{ salesOrderMain.itemNumber }}
+                <a-form-item label="订单数量">
+                  {{ salesOrderMain.iquantity }}
                 </a-form-item>
               </a-col>
-
               <a-col :md="6" :sm="8">
-                <a-form-item label="颜色">
-                  {{ salesOrderMain.color }}
+                <a-form-item label="出库数量">
+                  {{ salesOrderMain.foutquantity }}
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="8">
-                <a-form-item label="交期">
-                  {{ salesOrderMain.dpreDateBT }}
+                <a-form-item label="单价">
+                  {{ salesOrderMain.itaxUnitPriceD }}
                 </a-form-item>
               </a-col>
-
               <a-col :md="6" :sm="8">
-                <a-form-item label="订单数量">
-                  {{ salesOrderMain.iquantity }}
+                <a-form-item label="总额">
+                  {{ salesOrderMain.totalSum }}
                 </a-form-item>
               </a-col>
 
+              <!-- <a-col :md="6" :sm="8">
+                <a-form-item label="总额">
+                  {{ salesOrderMain.inatSum }}
+                </a-form-item>
+              </a-col> -->
+
               <a-col :md="6" :sm="8">
-                <a-form-item label="单价(原币)">
-                  {{ salesOrderMain.itaxUnitPrice }}
+                <a-form-item label="单价(采购)">
+                  {{ salesOrderMain.poPrice }}
                 </a-form-item>
               </a-col>
-
               <a-col :md="6" :sm="8">
-                <a-form-item label="总额(原币)">
-                  {{ salesOrderMain.totalSum }}
+                <a-form-item label="单价(委外)">
+                  {{ salesOrderMain.moPrice }}
                 </a-form-item>
               </a-col>
 
+
+              <!-- <a-col :md="6" :sm="8">
+                <a-form-item label="颜色">
+                  {{ salesOrderMain.color }}
+                </a-form-item>
+              </a-col> -->
               <a-col :md="6" :sm="8">
-                <a-form-item label="单价(本币)">
-                  {{ salesOrderMain.bbPrice }}
+                <a-form-item label="交期">
+                  {{ salesOrderMain.dpreDateBT }}
                 </a-form-item>
               </a-col>
+
               <a-col :md="6" :sm="8">
-                <a-form-item label="总额(本币)">
-                  {{ salesOrderMain.inatSum }}
+                <a-form-item label="计划单号">
+                  {{ salesOrderMain.planCode }}
                 </a-form-item>
               </a-col>
 
+            
+
+    
+<!--              
               <a-col :md="6" :sm="8">
                 <a-form-item label="单件成本(本币)">
                   {{ salesOrderMain.todo2 }}
                 </a-form-item>
               </a-col>
 
-              <a-col :md="6" :sm="8">
-                <a-form-item label="已出库数量">
-                  {{ salesOrderMain.foutquantity }}
-                </a-form-item>
-              </a-col>
+             
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="累计开票数量">
                   {{ salesOrderMain.ikpquantity }}
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="8">
-                <a-form-item label="计划单号">
-                  {{ salesOrderMain.planCode }}
-                </a-form-item>
-              </a-col>
+             
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="业务填写">
                   {{ salesOrderMain.todo3 }}
                 </a-form-item>
-              </a-col>
+              </a-col> -->
             </a-row>
           </a-form>
         </div>
@@ -118,7 +134,7 @@
       <!--采购 -->
       <a-card :bordered="true" style="margin:10px 0;">
         <div style="marginTop:30px;">
-          <h6 class="table-title">采购</h6>
+          <h6 class="table-title">采购/委外</h6>
           <a-table
             bordered
             rowKey="id"
@@ -136,7 +152,7 @@
         </div>
 
         <!-- 委外 -->
-        <div style="margin:60px 0;">
+        <!-- <div style="margin:60px 0;">
           <h6 class="table-title">委外</h6>
           <a-table
             bordered
@@ -147,12 +163,12 @@
             :data-source="weiwaiData"
             :scroll="{ x: 1500, y: 300 }"
           >
-            <!-- 物料编码 弹框-->
+           
             <span slot="cinvCode" slot-scope="text">
               <a>{{ text }}</a>
             </span>
           </a-table>
-        </div>
+        </div> -->
 
         <!-- 物料卡开始 -->
         <div>
@@ -255,34 +271,34 @@ export default {
 
       // 采购 表头
       CaiGouColumns: [
-        { title: '账套信息', width: 120, dataIndex: 'accId', fixed: 'left', className: 'replacecolor' },
+        { title: '账套信息', width: 120, dataIndex: 'account', fixed: 'left', className: 'replacecolor' },
         {
-          title: '采购订单号',
+          title: '订单号',
           width: 160,
-          dataIndex: 'cpoid',
+          dataIndex: 'poOrom',
           fixed: 'left',
           className: 'replacecolor'
         },
         {
-          title: '物料编码',
+          title: '物料名称',
           width: 120,
-          dataIndex: 'cinvCode',
-          className: 'replacecolor',
+          dataIndex: 'cInvName',
           fixed: 'left',
+          className: 'replacecolor',
           customCell: this.cinvCodeCustomCell,
           scopedSlots: { customRender: 'cinvCode' }
         },
-        { title: '供应商', width: 240, dataIndex: 'cvenName', align: 'left', className: 'replacecolor' },
-        { title: '单价(本币)', width: 140, dataIndex: 'inatUnitPrice', className: 'replacecolor' },
-        { title: '物料名称', width: 260, dataIndex: 'cinvName', align: 'left', className: 'replacecolor' },
-        { title: '计划数量(LRP)', width: 120, dataIndex: 'iquantityLrp', className: 'replacecolor' },
-        { title: '订单数量', width: 120, dataIndex: 'iquantity', className: 'replacecolor' },
-        { title: '累计入库数量', width: 120, dataIndex: 'ireceivedQTY', className: 'replacecolor' },
-        { title: '累计开票数量', width: 120, dataIndex: 'iinvQTY', className: 'replacecolor' },
-        { title: '累计开票金额', width: 120, dataIndex: 'iinvMoney', className: 'replacecolor' },
-        { title: '下游订单', width: 160, dataIndex: 'csocode', className: 'replacecolor' },
-        { title: '使用数量', width: 120, dataIndex: 'useQTY', className: 'replacecolor' },
-        { title: '余料', width: 100, dataIndex: 'surplusQty', fixed: 'right', className: 'replacecolor' }
+        //{ title: '物料名称', width: 260,fixed: 'left', dataIndex: 'cInvName', className: 'replacecolor' },
+        { title: '颜色', width: 260, dataIndex: 'color',  className: 'replacecolor' },
+        { title: '计划数量(LRP)', width: 120, dataIndex: 'iQuantityLrp', className: 'replacecolor' },
+        { title: '订单数量', width: 120, dataIndex: 'iQuantity', className: 'replacecolor' },
+        { title: '累计入库数量', width: 120, dataIndex: 'finquantity', className: 'replacecolor' },
+        { title: '使用数量', width: 120, dataIndex: 'iReceivedQTY', className: 'replacecolor' },
+        { title: '单价', width: 140, dataIndex: 'iNatUnitPrice', className: 'replacecolor' },
+        { title: '余料', width: 100, dataIndex: 'clout',  className: 'replacecolor' },
+        { title: '下游订单号', width: 160, dataIndex: 'downCode', className: 'replacecolor' },
+        { title: '供应商', width: 240, dataIndex: 'cVenName', className: 'replacecolor' },
+        { title: '订单类型', width: 240, dataIndex: 'poOromType',  className: 'replacecolor' }
       ],
       CaiGouData: [],
 
@@ -377,8 +393,7 @@ export default {
       this.$nextTick(() => {
         salesOrderDetails({
           color: this.record.color,
-          itemNumber: this.record.itemNumber,
-          marCode: this.record.cinvCode,
+          cInvCode: this.record.cinvCode,
           planCode: this.record.planCode,
           soCode: this.record.csocode
         }).then(res => {
@@ -386,7 +401,7 @@ export default {
             console.log('销售订单详情所有数据', res.result)
             this.salesOrderMain = res.result //主表信息
             this.CaiGouData = res.result.productionScheduleCaiGou //采购
-            this.weiwaiData = res.result.productionScheduleWeiWai //委外
+            //this.weiwaiData = res.result.productionScheduleWeiWai //委外
             // this.cardData = res.result.productionScheduleWeiWai //物料卡
           }
         })