new

src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue

@@ -222,6 +222,7 @@
               <el-input v-model="form1.remark" size="small" placeholder="备注"/>
             </el-form-item>
           </el-col>
+<<<<<<< HEAD
           <b v-show="title1 === '创建发票结算申请单'" style="float:left;color: #f56c6c;margin-top: 13px">* </b>
           <el-form-item v-show="title1 === '创建发票结算申请单'" label="发票扫描件" style="display: inline-block">
             <el-upload
@@ -237,6 +238,23 @@
               <i class="el-icon-plus"/>
             </el-upload>
           </el-form-item>
+=======
+          <!--<b v-show="title1 === '创建发票结算申请单'" style="float:left;color: #f56c6c;margin-top: 13px">* </b>-->
+          <!--<el-form-item v-show="title1 === '创建发票结算申请单'" label="发票扫描件" style="display: inline-block">-->
+          <!--<el-upload-->
+          <!--id="invoiceScan"-->
+          <!--ref="upload"-->
+          <!--:auto-upload="false"-->
+          <!--:on-success="uploadSuccess"-->
+          <!--:before-upload="beforeUpload"-->
+          <!--:on-exceed="warningExceed"-->
+          <!--:limit="limit"-->
+          <!--:action="upload+'?invoiceNum='+form1.invoiceNum+'&money='+form1.money+'&supplierValue='+form1.supplierValue+'&paid='+form1.paid+'&unpaid='+form1.unpaid+'&tax='+form1.tax+'&isCost='+form1.isCost+'&remark='+form1.remark+'&personId='+id"-->
+          <!--list-type="picture-card">-->
+          <!--<i class="el-icon-plus"/>-->
+          <!--</el-upload>-->
+          <!--</el-form-item>-->
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -317,11 +335,19 @@
 </template>
 
 <script>
+<<<<<<< HEAD
 import { searchSupplier, searchTable1, submitEdit, submitDelete, submitApply, searchTable2, searchPurchase, searchOffline, searchPurchaseDetail, searchOfflineDetail,
   addTable2, deleteTable2 } from '@/api/WorkshopProcurement/InvoiceSettlementApplication1'
 import { mapGetters } from 'vuex'
 import { uploadInvoiceScan1, readFile } from '@/utils/request'
 import request from '@/utils/request'
+=======
+import { insertInto, searchSupplier, searchTable1, submitEdit, submitDelete, submitApply, searchTable2, searchPurchase, searchOffline, searchPurchaseDetail, searchOfflineDetail,
+  addTable2, deleteTable2 } from '@/api/WorkshopProcurement/InvoiceSettlementApplication1'
+import { mapGetters } from 'vuex'
+import { uploadInvoiceScan1 } from '@/utils/request'
+
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 export default {
   name: '', // 发票结算申请
   data() {
@@ -429,9 +455,22 @@ export default {
     submitAdd1() { // 提交新增
       this.$refs['form1'].validate((valid) => {
         if (valid) {
+<<<<<<< HEAD
           this.$refs.upload.submit() // 上传图片
         } else {
           console.log('error submit!!')
+=======
+          insertInto(this.form1.invoiceNum, this.form1.money, this.form1.supplierValue, this.form1.paid, this.form1.unpaid, this.form1.tax, this.form1.isCost, this.form1.remark).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('增加成功')
+              this.dialogVisible1 = false
+              this.searchTable1()
+            } else {
+              this.$message.error('增加失败')
+            }
+          })
+        } else {
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           return false
         }
       })
@@ -449,7 +488,10 @@ export default {
             } else { this.$message.error('编辑失败') }
           })
         } else {
+<<<<<<< HEAD
           console.log('error submit!!')
+=======
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           return false
         }
       })
@@ -492,6 +534,7 @@ export default {
       })
     },
     async searchPic(row, i) {
+<<<<<<< HEAD
       const { data } = await request({
         url: '',
         method: 'post',
@@ -502,6 +545,8 @@ export default {
       })
       this.tableData1[i].scanSrc = readFile + data[0].文件标识 + '.' + data[0].文件后缀
       console.log(this.tableData1[i].scanSrc)
+=======
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     },
     warningExceed() {
       this.$message.error('仅可上传一张发票')
@@ -567,7 +612,10 @@ export default {
       this.supplierValue = row.供应商流水号
       Number(row.是否提交申请) === 1 ? this.disabled = true : this.disabled = false
       searchTable2(row.发票结算申请单流水号).then(response => {
+<<<<<<< HEAD
         console.log(response.data)
+=======
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         this.tableData2 = response.data
       })
     },