付款管理和入库单变更

src/api/V2/houseSelfCollect/index.js

@@ -139,4 +139,5 @@ export const API_GETQUALITY = '/qualityInspectionManagement/getQualityInspection
 export const API_GET_WAREHOUSE = '/warehouseBaseInfo/selectWarehouseSelfNew'
 
 export const API_POST_GETOKEN = `/photoFrameController/api/getToken`
-export const API_POST_GEROM = `/photoFrameController/api/getRom`
+export const API_POST_GEROM = `/photoFrameController/api/getRom`
+export const API_POST_UPLOADSELF = '/paymentManagement/uploadSelfCertificate'

src/model/houseSelfCollect/index.js

@@ -72,7 +72,8 @@ import {
     API_POST_GETCARNUMBER,
     API_POST_GETOKEN,
     API_POST_GEROM,
-    API_GETQUALITY
+    API_GETQUALITY,
+    API_POST_UPLOADSELF
 } from '@/api/V2/houseSelfCollect'
 //客户管理列表
 export const getCustomerManage = appRx.get(API_GET_CUSTOMER_MANAGE, errorCatcher, errorHandle, filter)
@@ -216,4 +217,6 @@ export const getwarehouse = appRx.get(API_GET_WAREHOUSE, errorCatcher, errorHand
 export const getToken = appRx.post(API_POST_GETOKEN, errorCatcher, errorHandle, filter)
 export const getRom = appRx.post(API_POST_GEROM, errorCatcher, errorHandle, filter)
 // 查询交易量
-export const getquality = appRx.get(API_GETQUALITY, errorCatcher, errorHandle, filter)
+export const getquality = appRx.get(API_GETQUALITY, errorCatcher, errorHandle, filter)
+// 上传自产证明
+export const uploadself = appRx.post(API_POST_UPLOADSELF, errorCatcher, errorHandle, filter)

src/views/contractManagement/salesContract.vue

@@ -655,7 +655,7 @@ export default {
         data = { id: row.id }
       }
       if (e == '执行中') {
-        if (row.addressUrl == '') {
+        if (row.addressUrl == ''&&localStorage.getItem('ws-pf_compName')=='黑龙江中天昊元贸易有限公司') {
           this.$notify.error({
             title: '失败',
             message: '修改失败，未上传双章合同附件',

src/views/houseSelfCollect/paymentManagement.vue

@@ -11,6 +11,7 @@
             <el-checkbox label="打印银行卡" name="type" class="label-width" @change="selectType"></el-checkbox>
             <el-checkbox label="打印结算凭证" name="type" class="label-width" @change="selectType($event)"></el-checkbox>
             <el-checkbox label="打印检斤单" name="type" class="label-width" @change="selectType($event)"></el-checkbox>
+            <el-checkbox label="打印自产证明" name="type" class="label-width" @change="selectType($event)"></el-checkbox>
             <!-- <el-checkbox label="打印回执单" name="type" class="label-width" @change="selectType($event)"></el-checkbox> -->
             <!-- <el-checkbox label="打印发票" name="type" class="label-width" @change="selectType($event)"></el-checkbox> -->
           </el-checkbox-group>
@@ -105,7 +106,13 @@
           href="https://taohaoliang.oss-cn-beijing.aliyuncs.com/pcfiles/%E6%94%B6%E8%B4%AD%E4%BF%A1%E6%81%AF%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF%EF%BC%88%E6%96%B0%EF%BC%89.xlsx"
           style="margin-left: 8px"
         >
-          <el-button type="primary">模板下载</el-button>
+          <el-button type="primary">收购导入模板</el-button>
+        </el-link>
+        <el-link
+          href="https://taohaoliang.oss-cn-beijing.aliyuncs.com/pcfiles/2023%E5%B9%B4%E8%87%AA%E4%BA%A7%E8%87%AA%E9%94%80%E8%AF%81%E6%98%8E%EF%BC%88%E6%97%A0%E7%BB%8F%E6%B5%8E%E4%BA%BA%EF%BC%89%202023.4.19.xlsx"
+          style="margin-left: 8px"
+        >
+          <el-button type="primary">自产证明模板</el-button>
         </el-link>
       </el-col>
       <el-col :span="4">
@@ -158,6 +165,15 @@
           </div>
         </template>
       </el-table-column>
+      <el-table-column class="table_td" prop="accountPaymentDate" width="120" label="总账付款日期"></el-table-column>
+      <el-table-column class="table_td" prop="paymentVoucherNumber" width="120" label="付款凭证编号"></el-table-column>
+      <el-table-column class="table_td" prop="amountIngPayable" width="80" label="自产证明">
+        <template slot-scope="scope">
+          <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
+          <span v-if="scope.row.selfCertificate != null">1</span>
+        </template>
+      </el-table-column>
       <el-table-column class="table_td" prop="updateDate" label="更新时间" width="150" sortable></el-table-column>
       <el-table-column class="table_td" prop="status" width="80" label="状态">
         <template scope="scope">
@@ -207,9 +223,9 @@
               (scope.row.status != '待结算' && !scope.row.approveStatus)
             " @click="print1(scope.row,2)" v-hasPermission="`acquisitionManagement.acquisitionPay.yeda`">业务打印
           </el-button>
-          <el-button @click="previewPayOrder(scope.row)" class="my-pre"
+          <!-- <el-button @click="previewPayOrder(scope.row)" class="my-pre"
             v-hasPermission="`acquisitionManagement.acquisitionPay.pay`">预览付款单
-          </el-button>
+          </el-button> -->
           <el-button type="danger" v-show="
               (!scope.row.approveStatus ||
                 scope.row.approveStatus == '待结算') &&
@@ -377,6 +393,15 @@
         <el-button type="primary" @click="invoicingconfirm">确 定</el-button>
       </span>
     </el-dialog>
+    <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')">
+      <div v-if="!appendixIdss">
+      <ws-upload ref="upload" :size-limit="size" @onChange="onChange" :comp-id="compId" :appendix-ids="appendixIdss"
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar" 
+        />
+      </div>
+      <ws-upload v-else ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+    </WinseaContentModal>
     <div class="mask1" v-show="isShowPrintTypeBills"></div>
     <div class="print-type1" v-show="isShowPrintTypeBills">
       <div class="print-type-content">
@@ -458,7 +483,8 @@
     suspendinstance,
     importWord,
     getPrint,
-    getwarehouse
+    getwarehouse,
+    uploadself
   } from '@/model/houseSelfCollect/index'
   import {
     posthandle,
@@ -469,9 +495,11 @@
     getHp
   } from '@/utils/getHasPermission'
   import download from '../../components/WsDownload/download'
+  import WsUpload from '@/components/WsUpload'
   export default {
     components: {
       paymentPrint,
+      WsUpload
     },
     watch: {},
     data() {
@@ -484,6 +512,7 @@
         isShowPrintType2: true,
         isShowPrintType3: true,
         isShowPrintType4: true,
+        isShowPrintType5:false,
         customerInfo: false,
         form: {},
         labelposition: 'right',
@@ -651,7 +680,11 @@
         ewCustomer: '黑龙江利润元粮食贸易有限公司',
         printSeparately:false,
         onePrint:false,
-        dialogDataList:[]
+        dialogDataList:[],
+        id:'',
+        accessoryTFs:false,
+        appendixIdss:'',
+        deptBudgetList:{}
       }
     },
     mounted() {
@@ -817,6 +850,31 @@
       })
     },
     methods: {
+      onChange() {
+        this.$refs.upload
+          .handleSaveBill()
+          .then(async (response) => {
+            this.deptBudgetList.selfCertificate = response
+            this.deptBudgetList.id = this.id
+            uploadself(this.deptBudgetList)
+              .toPromise()
+              .then((response) => {
+                this.accessoryTFs = false
+                this.$message.success('上传成功')
+                this.getList()
+              })
+          })
+          .catch((res) => {
+            EventBus.$emit('error', (JSON.parse(res) || {}).message)
+            this.$refs.upload.clearFiles()
+          })
+      },
+      fujian(row) {
+        this.id = row.id
+        this.accessoryTFs = true
+        this.appendixIdss = row.selfCertificate
+        console.log(this.appendixIdss)
+      },
       changeEw(e) {
         this.ddchecked = false
         if (e) {
@@ -1380,6 +1438,9 @@
             case '打印检斤单':
               this.isShowPrintType4 = !this.isShowPrintType4
               break
+            case '打印自产证明':
+              this.isShowPrintType5 = !this.isShowPrintType5
+              break
             // case '打印回执单':
             //   this.isShowPrintType5 = !this.isShowPrintType5
             //   break

src/views/warehousenew/warehousingOrder.vue

@@ -239,6 +239,17 @@
               <ws-upload ref="upload" :size-limit="size" @onChange="onChange" :comp-id="compId"
                 accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar" />
             </el-form-item>
+            <el-form-item label="付款凭证编号">
+              <el-input placeholder="输入付款凭证编号" v-model="form.paymentVoucherNumber"></el-input>
+            </el-form-item>
+            <el-form-item label="总账付款日期">
+              <el-date-picker
+                v-model="form.accountPaymentDate"
+                type="date"
+                value-format='yyyy-MM-dd'
+                placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
           </el-form>
         </div>
 
@@ -709,8 +720,8 @@ export default {
         distributionEd: '',
         distributionCan: '',
         distributionNot: '',
-        distributionIng: ''
-
+        distributionIng: '',
+        accountPaymentDate:''
       },
       // 表格显示数据
       tableDate: [],
@@ -1931,6 +1942,7 @@ export default {
         .replace('T', ' ')
         .split('.')[0]//默认结束时间今天
       // console.log([start.split(' '), end])
+      this.form.accountPaymentDate=end.split(' ')[0]
       return [start.split(' ')[0], end.split(' ')[0]]
     },
     cancel(item) {
@@ -2069,7 +2081,8 @@ export default {
 
       }
       console.log(arr2)
-      paymoney({ flag: 0, warehousingOrderList: arr2 }).toPromise()
+      paymoney({ flag: 0,accountPaymentDate:this.form.accountPaymentDate,
+        paymentVoucherNumber:this.form.paymentVoucherNumber, warehousingOrderList: arr2 }).toPromise()
         .then((response) => {
           this.$message({
             message: '付款成功',
@@ -2077,6 +2090,15 @@ export default {
           });
           this.aduitshow = false
           this.paymentScreenshot = ''
+          this.form={
+            accumulatedPrepayment: '',
+            recoveryPrepayments: '',
+            distributionEd: '',
+            distributionCan: '',
+            distributionNot: '',
+            distributionIng: '',
+            accountPaymentDate:''
+          }
           this.$refs.upload.clearFiles()
           this.getList()
         }).catch(() => {