发票合同

src/api/contract/invoice/index.js

@@ -74,7 +74,7 @@ export function invoiceSync(data) {
     params: data
   })
 }
-// 同步发票
+// 发票合同生成
 export function generateContract(data) {
   return request({
     url: '/contract/invoice/generateContract',
@@ -82,6 +82,14 @@ export function generateContract(data) {
     data: data
   })
 }
+// 获取发票签订日期
+export function getSigningDate(data) {
+  return request({
+    url: '/contract/invoice/getSigningDate',
+    method: 'post',
+    data: data
+  })
+}
 
 
 // ==================== 子表（发票明细） ====================

src/views/contract/contractTemplate/TemplateForm.vue

@@ -188,6 +188,17 @@
                     <el-button type="danger"  size="small" @click="addValue('发货单过账日期')"> 发货单过账日期 </el-button>
                     <el-button type="danger"  size="small" @click="addValue('销售凭证日期')"> 销售凭证日期 </el-button> -->
                   </el-collapse-item>
+                  <el-collapse-item title="发票明细附件" name="3-3" style="border-left: 1px solid #e6ebf5;border-right: 1px solid #e6ebf5; padding: 0 10px;">
+                    <el-button type="danger"  size="small" @click="addValue('明细合同编号')"> 明细合同编号 </el-button>
+                    <el-button type="danger"  size="small" @click="addValue('明细发票号码')"> 明细发票号码</el-button>
+                    <el-button type="danger"  size="small" @click="addValue('明细金额')"> 明细金额</el-button>
+                    <el-button type="danger"  size="small" @click="addValue('明细开票日期')"> 明细开票日期</el-button>
+                  </el-collapse-item>
+                  <el-collapse-item title="借贷项附件" name="3-4" style="border-left: 1px solid #e6ebf5;border-right: 1px solid #e6ebf5; padding: 0 10px;">
+                    <el-button type="danger"  size="small" @click="addValue('借贷项发票号码')"> 借贷项发票号码 </el-button>
+                    <el-button type="danger"  size="small" @click="addValue('借贷项金额')"> 借贷项金额</el-button>
+                    <el-button type="danger"  size="small" @click="addValue('借贷项类型')"> 借贷项类型</el-button>
+                  </el-collapse-item>
                 </el-collapse>
               </el-collapse-item>
 

src/views/contract/exportContract/components/OrderDetailsList.vue

@@ -22,15 +22,15 @@
                 <el-table-column label="原销售订单" align="center" prop="zzvbeln" width="90" show-overflow-tooltip/>
                 <el-table-column label="原项目" align="center" prop="zzposnr" width="90" show-overflow-tooltip/>
                 <el-table-column label="拒绝原因" align="center" prop="abgru" width="200" show-overflow-tooltip/>
-                <el-table-column label="凭证货币" align="center" prop="abgru" width="200" show-overflow-tooltip/>
-                <el-table-column label="价格组(佣金)" align="center" prop="abgru" width="110" show-overflow-tooltip/>
-                <el-table-column label="价格组描述(佣金)" align="center" prop="abgru" width="200" show-overflow-tooltip/>
-                <el-table-column label="佣金金额" align="center" prop="abgru" width="90" show-overflow-tooltip/>
-                <el-table-column label="销售单位" align="center" prop="abgru" width="90" show-overflow-tooltip/>
-                <el-table-column label="物料类型" align="center" prop="abgru" width="90" show-overflow-tooltip/>
-                <el-table-column label="物料属性" align="center" prop="abgru" width="90" show-overflow-tooltip/>
-                <el-table-column label="产品规格2" align="center" prop="abgru" width="200" show-overflow-tooltip/>
-                <el-table-column label="品种" align="center" prop="abgru" width="90" show-overflow-tooltip/>
+                <el-table-column label="凭证货币" align="center" prop="waerk" width="200" show-overflow-tooltip/>
+                <el-table-column label="价格组(佣金)" align="center" prop="konda" width="110" show-overflow-tooltip/>
+                <el-table-column label="价格组描述(佣金)" align="center" prop="kondat" width="200" show-overflow-tooltip/>
+                <el-table-column label="佣金金额" align="center" prop="kwert" width="90" show-overflow-tooltip/>
+                <el-table-column label="销售单位" align="center" prop="vrkme" width="90" show-overflow-tooltip/>
+                <el-table-column label="物料类型" align="center" prop="mtart" width="90" show-overflow-tooltip/>
+                <el-table-column label="物料属性" align="center" prop="zwlsx" width="90" show-overflow-tooltip/>
+                <el-table-column label="产品规格2" align="center" prop="zzcpgg2" width="200" show-overflow-tooltip/>
+                <el-table-column label="品种" align="center" prop="zzpz" width="90" show-overflow-tooltip/>
                 <el-table-column label="创建时间" align="center" prop="createTime" width="180">
                   <template v-slot="scope">
                     <span>{{ parseTime(scope.row.createTime) }}</span>

src/views/contract/invoice/index.vue

@@ -216,7 +216,7 @@
        <el-button type="success" plain icon="el-icon-bottom" size="mini" @click="invoiceSync()">同步</el-button>
       </el-col>
       <el-col :span="1.5">
-       <el-button type="primary" plain icon="el-icon-document-checked" size="mini" @click="dialogVisible = true;signingDate=''">手工生成</el-button>
+       <el-button type="primary" plain icon="el-icon-document-checked" size="mini" @click="signingDateShow()">手工生成</el-button>
       </el-col>
       <el-col :span="1.5">
        <el-button type="primary" plain icon="el-icon-document-copy" size="mini" @click="generateContract(2)">批量生成</el-button>
@@ -509,6 +509,17 @@ export default {
     invoiceSync() {
       this.$refs["syncFormRef"].open();
     },
+    async signingDateShow(){
+      if(this.ids.length == 0 ){
+          this.$modal.msgError("请选择需要生成合同的订单数据")
+          return
+      }
+      let data={};
+      data.ids = this.ids.join(",")
+      let result = await InvoiceApi.getSigningDate(data);
+      this.dialogVisible = true;
+      this.signingDate=result.data
+    },
     async generateContract(type){
       this.dialogVisible = false
       let data={};