Quellcode durchsuchen

提交安品部分问题

caojunjie vor 4 Jahren
Ursprung
Commit
ddef122ec8

+ 296 - 288
src/views/finance/applyForInvoice/salesInvoice/index.vue

@@ -126,7 +126,8 @@
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       :visible.sync="dialogVisible"
-      width="70%">
+      width="70%"
+    >
       <el-form :inline="true" :model="formInline" class="demo-form-inline" label-width="100">
         <el-form-item label="系统编号">
           <el-input v-model="formInline.fBillno" style="width: 240px;" placeholder="系统编号"></el-input>
@@ -137,7 +138,8 @@
               v-for="(item,index) in dataList.projectId"
               :key="index"
               :label="item.label"
-              :value="item.value">
+              :value="item.value"
+            >
             </el-option>
           </el-select>
         </el-form-item>
@@ -147,7 +149,8 @@
               v-for="(item,index) in dataList.fCtrlcorpid"
               :key="index"
               :label="item.label"
-              :value="item.value">
+              :value="item.value"
+            >
             </el-option>
           </el-select>
         </el-form-item>
@@ -160,7 +163,8 @@
             start-placeholder="开始日期"
             value-format="yyyy-MM-dd"
             :default-time="['00:00:00', '23:59:59']"
-            end-placeholder="结束日期">
+            end-placeholder="结束日期"
+          >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="客户名称">
@@ -169,7 +173,8 @@
               v-for="(item,index) in dataList.fCorpid"
               :key="index"
               :label="item.label"
-              :value="item.value">
+              :value="item.value"
+            >
             </el-option>
           </el-select>
         </el-form-item>
@@ -182,7 +187,8 @@
               v-for="(item,index) in dataList.fBillstatus"
               :key="index"
               :label="item.label"
-              :value="item.value">
+              :value="item.value"
+            >
             </el-option>
           </el-select>
         </el-form-item>
@@ -206,46 +212,47 @@ import {
   retrieval,
   preservation,
   taxControl
-} from  '@/api/finance/salesInvoice'
+} from '@/api/finance/salesInvoice'
 import { company, queryItem } from '@/api/purchaseIssue'
 import log from '@/views/monitor/job/log'
 import moment from 'moment'
-export default{
+
+export default {
   name: 'index',
-  data(){
+  data() {
     return {
-      formInline:{},
-      activeIndex:'1',
-      invoSetRowList:[],
-      total:0,
-      invoiceContentList:[],
-      dialogVisible:false,
+      formInline: {},
+      activeIndex: '1',
+      invoSetRowList: [],
+      total: 0,
+      invoiceContentList: [],
+      dialogVisible: false,
       pageDisplay: true,
       searchWhether: true,
-      invoice:true,
+      invoice: true,
       isItHidden: true,
-      tatolLabel: ['金额','金额(含税)'],
-      contentList:[],
-      listData:[],
-      setRowList:[],
-      tableData:[],
-      hasPermi:{
+      tatolLabel: ['金额', '金额(含税)'],
+      contentList: [],
+      listData: [],
+      setRowList: [],
+      tableData: [],
+      hasPermi: {
         lookup: ['financeCenter:invoiceApplyFor:query'],
-        disappear:['financeCenter:invoiceApplyFor:remove']
+        disappear: ['financeCenter:invoiceApplyFor:remove']
       },
       dataList: {
-        projectId:[],
-        fCtrlcorpid:[],
-        fCorpid:[],
-        fBillstatus:[{
-          label:'已开票',
-          value:6
-        },{
-          label:'暂存',
-          value:2
+        projectId: [],
+        fCtrlcorpid: [],
+        fCorpid: [],
+        fBillstatus: [{
+          label: '已开票',
+          value: 6
+        }, {
+          label: '暂存',
+          value: 2
         }]
       },
-      inDex:4,
+      inDex: 4,
       queryList: {
         tableName: '销项发票',
         columnList: []
@@ -254,72 +261,72 @@ export default{
         tableName: '销项费用详情',
         columnList: []
       },
-      invoiceList:{
+      invoiceList: {
         tableName: '销项发票详情',
         columnList: []
       },
-      contentButton:[
+      contentButton: [
         {
-        type: 'primary',
-        size: 'mini',
-        icon: 'el-icon-plus',
-        name: '检索',
-        disabled: false
-      }, {
-        type: 'primary',
-        size: 'mini',
-        icon: 'el-icon-plus',
-        name: '保存',
-        plain: true,
-        disabled: false
-      }, {
-        type: 'primary',
-        size: 'mini',
-        icon: 'el-icon-edit-outline',
-        name: '请核',
-        disabled: true
-      }, {
-        type: 'success',
-        size: 'mini',
-        icon: 'el-icon-edit',
-        name: '修改',
-        disabled: false
-      },{
+          type: 'primary',
+          size: 'mini',
+          icon: 'el-icon-plus',
+          name: '检索',
+          disabled: false
+        }, {
+          type: 'primary',
+          size: 'mini',
+          icon: 'el-icon-plus',
+          name: '保存',
+          plain: true,
+          disabled: false
+        }, {
+          type: 'primary',
+          size: 'mini',
+          icon: 'el-icon-edit-outline',
+          name: '请核',
+          disabled: false
+        }, {
+          type: 'success',
+          size: 'mini',
+          icon: 'el-icon-edit',
+          name: '修改',
+          disabled: false
+        }, {
           type: 'danger',
           size: 'mini',
           icon: 'el-icon-download',
           name: '生成税控',
-          disabled: false,
-        },{
+          disabled: false
+        }, {
           type: 'info',
           size: 'mini',
           icon: 'el-icon-download',
           name: '查看',
-          disabled: false,
+          disabled: false
         }],
       customButton: [
         {
-        type: 'primary',
-        size: 'mini',
-        icon: 'el-icon-plus',
-        name: '新单',
-        disabled: false,
-        hasPermi: ['financeCenter:invoiceApplyFor:query']
-      },{
-        type: 'warning',
-        size: 'mini',
-        icon: 'el-icon-upload2',
-        name: '导出',
-        disabled: false,
+          type: 'primary',
+          size: 'mini',
+          icon: 'el-icon-plus',
+          name: '新单',
+          disabled: false,
+          hasPermi: ['financeCenter:invoiceApplyFor:query']
+        }, {
+          type: 'warning',
+          size: 'mini',
+          icon: 'el-icon-upload2',
+          name: '导出',
+          disabled: false,
+          hasPermi: ['financeCenter:invoiceApplyFor:query']
+        }, {
+          type: 'success',
+          size: 'mini',
+          icon: 'el-icon-c-scale-to-original',
+          name: '复制新单',
+          disabled: false,
           hasPermi: ['financeCenter:invoiceApplyFor:query']
-      },{
-        type: 'success',
-        size: 'mini',
-        icon: 'el-icon-c-scale-to-original',
-        name: '复制新单',
-        disabled: false,
-        hasPermi: ['financeCenter:invoiceApplyFor:query']
-      }],
+        }],
       listStyle: [
         {
           surface: '1',
@@ -328,91 +335,91 @@ export default{
           checked: 0,
           width: 100,
           onabort: ''
-        },{
-        surface: '2',
-        label: 'fBillno',
-        name: '系统编号',
-        checked: 0,
-        width: 100,
-        onabort: ''
-      },{
-        surface: '3',
-        label: 'projectName',
-        name: '项目名称',
-        checked: 0,
-        width: 100,
-        onabort: ''
-      },{
-        surface: '4',
-        label: 'fCtrlcorpid',
-        name: '开票公司',
-        checked: 0,
-        width: 100,
-        onabort: ''
-      },{
-        surface: '5',
-        label: 'createTime',
-        name: '出库日期',
-        checked: 0,
-        width: 100,
-        onabort: ''
-      },{
-        surface: '6',
-        label: 'fCorpidName',
-        name: '客户名称',
-        checked: 0,
-        width: 100,
-        onabort: ''
-      },{
-        surface: '7',
-        label: 'fAmtdr',
-        name: '金额',
-        checked: 0,
-        width: 100,
-        onabort: ''
-      },{
-        surface: '8',
-        label: 'fRemarks',
-        name: '备注',
-        checked: 0,
-        width: 100,
-        onabort: ''
-      },{
-        surface: '9',
-        label: 'fBillstatusName',
-        name: '状态',
-        checked: 0,
-        width: 100,
-        onabort: ''
-      },{
-        surface: '10',
-        label: 'invoiceNo',
-        name: '发票号',
-        checked: 0,
-        width: 100,
-        onabort: ''
-      },{
-        surface: '11',
-        label: 'fInvoiceDate',
-        name: '开票日期',
-        checked: 0,
-        width: 100,
-        onabort: ''
-      },{
-        surface: '12',
-        label: 'createBy',
-        name: '制单人',
-        checked: 0,
-        width: 100,
-        onabort: ''
-      },{
-        surface: '13',
-        label: 'createTime',
-        name: '制单日期',
-        checked: 0,
-        width: 100,
-        onabort: ''
-      },{
+        }, {
+          surface: '2',
+          label: 'fBillno',
+          name: '系统编号',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        }, {
+          surface: '3',
+          label: 'projectName',
+          name: '项目名称',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        }, {
+          surface: '4',
+          label: 'fCtrlcorpid',
+          name: '开票公司',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        }, {
+          surface: '5',
+          label: 'createTime',
+          name: '出库日期',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        }, {
+          surface: '6',
+          label: 'fCorpidName',
+          name: '客户名称',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        }, {
+          surface: '7',
+          label: 'fAmtdr',
+          name: '金额',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        }, {
+          surface: '8',
+          label: 'fRemarks',
+          name: '备注',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        }, {
+          surface: '9',
+          label: 'fBillstatusName',
+          name: '状态',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        }, {
+          surface: '10',
+          label: 'invoiceNo',
+          name: '发票号',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        }, {
+          surface: '11',
+          label: 'fInvoiceDate',
+          name: '开票日期',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        }, {
+          surface: '12',
+          label: 'createBy',
+          name: '制单人',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        }, {
+          surface: '13',
+          label: 'createTime',
+          name: '制单日期',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        }, {
           surface: '14',
           label: 'operation',
           name: '操作',
@@ -422,13 +429,13 @@ export default{
           operation: '1',
           onabort: ''
         }],
-      invoiceStyle:[
+      invoiceStyle: [
         {
           surface: '1',
           label: 'fFeeName',
           name: '货物或应税劳务、服务名称',
           checked: 0,
-          width: 100,
+          width: 100
         },
         {
           surface: '2',
@@ -529,14 +536,14 @@ export default{
           width: 100
         }
       ],
-      contentStyle:[
+      contentStyle: [
         {
           surface: '1',
           label: 'serialNumber',
           name: '序号',
           checked: 0,
           width: 100,
-          onabort: '',
+          onabort: ''
         },
         {
           surface: '1',
@@ -544,64 +551,64 @@ export default{
           name: '项目名称',
           checked: 0,
           width: 100,
-          onabort: '',
-        },{
+          onabort: ''
+        }, {
           surface: '2',
           label: 'fBillno',
           name: '销售单号',
           checked: 0,
           width: 100,
-          onabort: '',
-        },{
+          onabort: ''
+        }, {
           surface: '3',
           label: 'fBsdate',
           name: '出库日期',
           checked: 0,
           width: 100,
-          onabort: '',
-        },{
+          onabort: ''
+        }, {
           surface: '4',
           label: 'fFeetype',
           name: '物料类别',
           checked: 0,
           width: 100,
           onabort: ''
-        },{
+        }, {
           surface: '5',
           label: 'fFeeName',
           name: '品名',
           checked: 0,
           width: 100,
           onabort: ''
-        },{
+        }, {
           surface: '6',
           label: 'fCurrency',
           name: '规格',
           checked: 0,
           width: 100,
           onabort: ''
-        },{
+        }, {
           surface: '7',
           label: 'fUnitprice',
           name: '单价',
           checked: 0,
           width: 100,
           onabort: ''
-        },{
+        }, {
           surface: '8',
           label: 'feeUnitName',
           name: '计量单位',
           checked: 0,
           width: 100,
           onabort: ''
-        },{
+        }, {
           surface: '9',
           label: 'fAmt',
           name: '金额',
           checked: 0,
           width: 100,
           onabort: ''
-        },{
+        }, {
           surface: '10',
           label: 'fTaxCode',
           name: '税务代码',
@@ -610,7 +617,7 @@ export default{
           onabort: ''
         }
       ],
-      contentOption:[
+      contentOption: [
         {
           span: 6,
           label: 'fBillno',
@@ -619,7 +626,7 @@ export default{
           width: 200,
           labelSize: '80',
           rules: [{ required: false, message: ' ' }]
-        },{
+        }, {
           span: 6,
           label: 'projectId',
           name: '项目名称',
@@ -627,7 +634,7 @@ export default{
           width: 201,
           labelSize: '80',
           rules: [{ required: true, message: ' ' }]
-        },{
+        }, {
           span: 6,
           label: 'fCtrlcorpid',
           name: '开票公司',
@@ -635,7 +642,7 @@ export default{
           width: 200,
           labelSize: '80',
           rules: [{ required: true, message: ' ' }]
-        },{
+        }, {
           span: 6,
           label: 'fBsDateTime',
           name: '出库日期',
@@ -643,7 +650,7 @@ export default{
           width: 200,
           labelSize: '80',
           rules: [{ required: false, message: ' ' }]
-        },{
+        }, {
           span: 6,
           label: 'fCorpid',
           name: '客户名称',
@@ -651,7 +658,7 @@ export default{
           width: 200,
           labelSize: '80',
           rules: [{ required: true, message: ' ' }]
-        },{
+        }, {
           span: 6,
           label: 'fRemarks',
           name: '备注',
@@ -659,7 +666,7 @@ export default{
           width: 200,
           labelSize: '80',
           rules: [{ required: false, message: ' ' }]
-        },{
+        }, {
           span: 6,
           label: 'fBillstatus',
           name: '状态',
@@ -687,71 +694,71 @@ export default{
           rules: [{ required: false, message: ' ' }]
         }
       ],
-      formOption:[
+      formOption: [
         {
-        span: 6,
-        label: 'fBillno',
-        name: '系统编号',
-        inputType: 2,
-        width: 200,
-        labelSize: '80',
-        rules: [{ required: false, message: ' ' }]
-      },{
-        span: 6,
-        label: 'projectId',
-        name: '项目名称',
-        inputType: 1,
-        width: 200,
-        labelSize: '80',
-        rules: [{ required: false, message: ' ' }]
-      },{
-        span: 6,
-        label: 'fCtrlcorpid',
-        name: '开票公司',
-        inputType: 1,
-        width: 200,
-        labelSize: '80',
-        rules: [{ required: false, message: ' ' }]
-      },{
-        span: 6,
-        label: 'fBsDateTime',
-        name: '出库日期',
-        inputType: 3,
-        width: 200,
-        labelSize: '80',
-        rules: [{ required: false, message: ' ' }]
-      },{
-        span: 6,
-        label: 'fCorpid',
-        name: '客户名称',
-        inputType: 1,
-        width: 200,
-        labelSize: '80',
-        rules: [{ required: false, message: ' ' }]
-      },{
-        span: 6,
-        label: 'fRemarks',
-        name: '备注',
-        inputType: 2,
-        width: 200,
-        labelSize: '80',
-        rules: [{ required: false, message: ' ' }]
-      },{
-        span: 6,
-        label: 'fBillstatus',
-        name: '状态',
-        inputType: 1,
-        width: 200,
-        labelSize: '80',
-        rules: [{ required: false, message: ' ' }]
-      }],
+          span: 6,
+          label: 'fBillno',
+          name: '系统编号',
+          inputType: 2,
+          width: 200,
+          labelSize: '80',
+          rules: [{ required: false, message: ' ' }]
+        }, {
+          span: 6,
+          label: 'projectId',
+          name: '项目名称',
+          inputType: 1,
+          width: 200,
+          labelSize: '80',
+          rules: [{ required: false, message: ' ' }]
+        }, {
+          span: 6,
+          label: 'fCtrlcorpid',
+          name: '开票公司',
+          inputType: 1,
+          width: 200,
+          labelSize: '80',
+          rules: [{ required: false, message: ' ' }]
+        }, {
+          span: 6,
+          label: 'fBsDateTime',
+          name: '出库日期',
+          inputType: 3,
+          width: 200,
+          labelSize: '80',
+          rules: [{ required: false, message: ' ' }]
+        }, {
+          span: 6,
+          label: 'fCorpid',
+          name: '客户名称',
+          inputType: 1,
+          width: 200,
+          labelSize: '80',
+          rules: [{ required: false, message: ' ' }]
+        }, {
+          span: 6,
+          label: 'fRemarks',
+          name: '备注',
+          inputType: 2,
+          width: 200,
+          labelSize: '80',
+          rules: [{ required: false, message: ' ' }]
+        }, {
+          span: 6,
+          label: 'fBillstatus',
+          name: '状态',
+          inputType: 1,
+          width: 200,
+          labelSize: '80',
+          rules: [{ required: false, message: ' ' }]
+        }],
       formDataList: {
         fBilltype: 'XXFP',
         pageSize: 10,
         pageNum: 1
       },
-      queryFilter:{},
-      selection:[]
+      queryFilter: {},
+      selection: []
     }
   },
   created() {
@@ -795,7 +802,7 @@ export default{
     })
     this.queryHome()
   },
-  methods:{
+  methods: {
     //切换明细列表
     handleSelect(key, keyPath) {
       // console.log(key, keyPath);
@@ -816,36 +823,36 @@ export default{
       }
     },
     //查询主页列表数据
-    queryHome(data){
+    queryHome(data) {
       let lsit = {}
       if (data) lsit = data
       if (!data) lsit = this.formDataList
-      listCharge(lsit).then(res =>{
+      listCharge(lsit).then(res => {
         this.tableData = res.rows
         this.tableData.map(item => {
-          item.createTime = moment(item.createTime).format('YYYY-MM-DD h:mm:ss');
-          item.fInvoiceDate = moment(item.fInvoiceDate).format('YYYY-MM-DD h:mm:ss');
+          item.createTime = moment(item.createTime).format('YYYY-MM-DD h:mm:ss')
+          item.fInvoiceDate = moment(item.fInvoiceDate).format('YYYY-MM-DD h:mm:ss')
         })
         this.total = res.total
         console.log(res)
       })
     },
     //查询列
-    getRow(data){
+    getRow(data) {
       console.log(data)
-      select(data).then(res =>{
+      select(data).then(res => {
         console.log(data.tableName)
-        if(data.tableName === '销项发票'){
-          if (res.data.length !== 0){
+        if (data.tableName === '销项发票') {
+          if (res.data.length !== 0) {
             this.queryList.columnList = res.data.filter((e) => e.checked == 0)
             this.queryList.columnList = res.data
             this.setRowList = res.data
             this.queryList.columnList = this.queryList.columnList.filter((e) => e.checked == 0)
-          }else {
+          } else {
             this.$set(this.queryList, 'columnList', this.$options.data().listStyle)
             this.setRowList = this.$options.data().listStyle
           }
-        }else if (data.tableName === '销项费用详情') {
+        } else if (data.tableName === '销项费用详情') {
           if (res.data.length != 0) {
             this.purchaseList.columnList = res.data.filter((e) => e.checked == 0)
             this.purchaseList.columnList = res.data
@@ -855,7 +862,7 @@ export default{
             this.$set(this.purchaseList, 'columnList', this.$options.data().contentStyle)
             this.setRowList = this.$options.data().contentStyle
           }
-        }else {
+        } else {
           if (res.data.length != 0) {
             this.invoiceList.columnList = res.data.filter((e) => e.checked == 0)
             this.invoiceList.columnList = res.data
@@ -869,7 +876,7 @@ export default{
       })
     },
     //详情内容保存
-    submitAndSave(item, res){
+    submitAndSave(item, res) {
       console.log(item, res)
       let formData = new window.FormData()
       let list = this.$refs.avatar.form
@@ -886,27 +893,27 @@ export default{
       formData.append('tFeeDo', JSON.stringify(this.contentList))
       formData.append('tFeeInvoice', JSON.stringify(this.invoiceContentList))
       formData.append('billsType', 'XXFP')
-      preservation(formData).then(res =>{
+      preservation(formData).then(res => {
         console.log(res)
         this.$message.success('保存成功')
       })
     },
     //表单选中后触发
-    selectTrigger(name, list, id){
+    selectTrigger(name, list, id) {
       console.log(name, list, id)
     },
     //请核
-    writeOff(){
+    writeOff() {
       console.log('请核')
     },
     //选择框
-    selectionbox(selection){
+    selectionbox(selection) {
       console.log(selection)
       this.selection = selection
     },
     //查看
-    viewMethod(scope, res, i){
-      viewDetails(scope.row.fId).then(res =>{
+    viewMethod(scope, res, i) {
+      viewDetails(scope.row.fId).then(res => {
         if (this.$refs.avatar.form) this.queryFilter = this.$refs.avatar.form
         this.getRow({
           tableName: this.purchaseList.tableName,
@@ -924,7 +931,7 @@ export default{
     modification(scope) {
     },
     //删除
-    deletion(scope){
+    deletion(scope) {
       tableDeleteQuery(scope.row.fId).then(res => {
         this.$confirm(res.msg == 1 ? '主表数据为空' : (res.msg == 2 ? '主表有数据' : '未知状态') + '是否永久删除该条数据?', '提示', {
           confirmButtonText: '确定',
@@ -972,7 +979,7 @@ export default{
       this.searchWhether = !this.searchWhether
     },
     //返回列表
-    backToList(){
+    backToList() {
       this.pageDisplay = true
       this.isItHidden = true
       this.inDex = 4
@@ -985,8 +992,8 @@ export default{
       this.$refs.avatar.submitForm()
     },
     //所有按钮
-    buttonList(row){
-      switch (row.name){
+    buttonList(row) {
+      switch (row.name) {
         case '新单':
           this.pageDisplay = false
           this.isItHidden = false
@@ -1007,27 +1014,27 @@ export default{
           this.$refs.avatar.submitForm('submit')
           break
         case '生成税控':
-          if (this.$refs.avatar.form.fViewurl){
+          if (this.$refs.avatar.form.fViewurl) {
             this.$message.error('已生成税控,请点击查看或者下载')
-          }else {
-            taxControl(this.$refs.avatar.form.fId).then(res =>{
+          } else {
+            taxControl(this.$refs.avatar.form.fId).then(res => {
               console.log(res)
               this.$message.success('生成成功')
 
-              viewDetails(this.$refs.avatar.form.fId).then(res =>{
+              viewDetails(this.$refs.avatar.form.fId).then(res => {
                 this.$refs.avatar.form = res.data.tFee
               })
             })
           }
           break
         case '查看':
-          if (!this.$refs.avatar.form.fViewurl){
+          if (!this.$refs.avatar.form.fViewurl) {
             this.$message.error('未生成税控,请生成税控')
-          }else {
+          } else {
             window.open(
               this.$refs.avatar.form.fViewurl,
-              "_blank",//新的窗口打开
-              "width=800,height=500,menubar=no,toolbar=no,location=no,status=no,resizable=no"//配置项
+              '_blank',//新的窗口打开
+              'width=800,height=500,menubar=no,toolbar=no,location=no,status=no,resizable=no'//配置项
             )
           }
           break
@@ -1036,30 +1043,31 @@ export default{
       }
     },
     //内容页面检索调用
-    retrieval(){
+    retrieval() {
       let list = this.$refs.avatar.form
       list.fBilltype = 'XXFP'
-      retrieval(list).then(res=>{
+      retrieval(list).then(res => {
         console.log(res)
         this.contentList = res.data.tFeeDo
         this.invoiceContentList = res.data.tFeeInvice
       })
     },
     //表单验证通过执行搜索
-    submitForm(){
+    submitForm() {
       let list = this.$refs.avatar.form
       list.pageNum = this.formDataList.pageNum
       list.fBilltype = this.formDataList.fBilltype
       list.pageSize = this.formDataList.pageSize
       this.queryHome(list)
     },
-    returnToForm(){
+    returnToForm() {
 
     },
     //点击刷新会调用此方法
-    getList(){},
+    getList() {
+    },
     //详情表内容移出
-    deletRows(index, rows){
+    deletRows(index, rows) {
       console.log(index, rows)
     },
     //计算金额
@@ -1068,7 +1076,7 @@ export default{
         scope.row.fAmount = (scope.row.fUnitprice * scope.row.fQty).toFixed(2)
       }
     },
-    change(scope){
+    change(scope) {
       console.log(scope)
     }
   }

+ 1 - 1
src/views/purchaseRequest/index.vue

@@ -806,7 +806,7 @@ export default {
       userId: Cookies.get('userName')
     }
     let y = moment(Date.parse(new Date())).format('YYYY-MM-DD')
-    // this.$set(this.formDataList,'timeInterval',[ y + ' 00:00:00', y + ' 23:59:59'])
+    this.$set(this.formDataList,'timeInterval',[ y + ' 00:00:00', y + ' 23:59:59'])
     this.getRow(data)
     this.query(this.formDataList)
     productName().then(res => {

+ 2 - 2
src/views/system/auditConfiguration/index.vue

@@ -50,8 +50,8 @@
           <span v-if="scope.row.actId === 320">协议计划费审批流程</span>
           <span v-if="scope.row.actId === 410">下单审批流程</span>
           <span v-if="scope.row.actId === 420">配船审批流程</span>
-          <span v-if="scope.row.actId === 430">凯合对账审批流程</span>
-          <span v-if="scope.row.actId === 440">凯合收费审批流程</span>
+          <span v-if="scope.row.actId === 430">销项发票审批流程</span>
+          <span v-if="scope.row.actId === 440">进项发票审批流程</span>
           <span v-if="scope.row.actId === 450">凯合付费审批流程</span>
           <span v-if="scope.row.actId === 460">凯合费用审批流程</span>
           <span v-if="scope.row.actId === 470">凯合发票申请审批流程</span>