浏览代码

合同管理

caojunjie 2 年之前
父节点
当前提交
bea4b9981e

+ 32 - 0
src/api/contractManagement/index.js

@@ -0,0 +1,32 @@
+import request from '@/utils/request'
+
+// 查询列宽修改列表
+export function listQuery(query) {
+  return request({
+    url: '/agreement/contractManagement/list',
+    method: 'get',
+    params:query
+  })
+}
+//保存详情页面内容
+export function submit(data) {
+  return request({
+    url: '/agreement/contractManagement/contractManagementAdd',
+    method: 'post',
+    data:data
+  })
+}
+// 查询单条数据
+export function viewSingle(query) {
+  return request({
+    url: '/agreement/contractManagement/'+query,
+    method: 'get',
+  })
+}
+//确认删除整个表
+export function confirmDeletion(fIds) {
+  return request({
+    url: '/agreement/contractManagement/' + fIds,
+    method: 'delete'
+  })
+}

+ 4 - 2
src/components/cUpload/index.vue

@@ -99,7 +99,7 @@
           <el-input
             v-if="item.inputType == 1"
             v-model="scope.row[item.label]"
-            :disabled="disabled"
+            :disabled="item.name == '上传人'?true:disabled"
             :placeholder="item.name"
             show-word-limit
           />
@@ -314,7 +314,9 @@ export default {
   props:{
     list: {
       type: Array,
-      default: []
+      default: ()=>{
+        return []
+      }
     },
     disabled:{
       type:Boolean,

+ 662 - 0
src/views/contractManagement/index.vue

@@ -0,0 +1,662 @@
+<template>
+  <div class="app-container">
+    <formComponent
+      v-if="searchWhether"
+      :formOption="formOption"
+      :dataList="dataList"
+      :inDex="inDex"
+      ref="avatar"
+      @submitForm="submitForm"
+    />
+    <listComponent
+      :tableData="tableData"
+      @selectionbox="selectionbox"
+      @see="viewMethod"
+      @deletion="deletion"
+      @buttonList="buttonList"
+      @showSearch="showSearch"
+      @feedback="feedback"
+      @getList="getList"
+      :hasPermi="hasPermi"
+      :isItHidden="isItHidden"
+      :customButton="customButton"
+      :listStyle="listStyle"
+      :queryList="queryList"
+      :setRowList="setRowList"
+    />
+    <div style="float: right;margin-bottom: 10px">
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="search.pageNum"
+        :limit.sync="search.pageSize"
+        :page-sizes="[10,100,200,500,1000]"
+        @pagination="feedback('搜索')"
+      />
+    </div>
+    <el-dialog
+      :title="form.fId?'修改':'新增'"
+      :visible.sync="dialogVisible"
+      width="80%"
+      :close-on-click-modal="false"
+      v-if="dialogVisible"
+    >
+      <div>
+        <el-form :model="form" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm" size="small">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="档案编号" prop="contractNo">
+                <el-input v-model="form.contractNo" placeholder="档案编号"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="建立日期" prop="creationDate">
+                <el-date-picker
+                  v-model="form.creationDate"
+                  type="date"
+                  style="width: 100%;"
+                  value-format="yyyy-MM-dd"
+                  placeholder="选择日期"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="档案内容" prop="content">
+                <el-input v-model="form.content" placeholder="档案内容"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="文件类型" prop="fileType">
+                <el-select style="width: 100%;" v-model="form.fileType" placeholder="请选择">
+                  <el-option
+                    v-for="item in dataList.fileType"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="档案份数" prop="copies">
+                <el-input v-model="form.copies" placeholder="档案份数"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="提交方式" prop="submissionMethod">
+                <el-select style="width: 100%;" v-model="form.submissionMethod" placeholder="请选择">
+                  <el-option
+                    v-for="item in dataList.submissionMethod"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="签发单位" prop="issuingUnitId">
+                <el-select style="width: 100%;" v-model="form.issuingUnitId" placeholder="请选择">
+                  <el-option
+                    v-for="item in dataList.issuingUnitId"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="有效期" prop="validityMonth">
+                <el-input-number style="width: 100%;" v-model="form.validityMonth" :min="1" :controls="false"
+                                 placeholder="请输入有效期月份数字"
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="归档时间" prop="archiveTime">
+                <el-date-picker
+                  v-model="form.archiveTime"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  style="width: 100%;"
+                  placeholder="选择日期"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="提交部门" prop="submittingDepartmentId">
+                <el-select style="width: 100%;" v-model="form.submittingDepartmentId" placeholder="请选择">
+                  <el-option
+                    v-for="item in dataList.submittingDepartmentId"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="保管期限" prop="storagePeriodTime">
+                <el-date-picker
+                  v-model="form.storagePeriodTime"
+                  type="date"
+                  style="width: 100%;"
+                  value-format="yyyy-MM-dd"
+                  placeholder="选择日期"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="保管人" prop="custodianId">
+                <el-select style="width: 100%;" v-model="form.custodianId" placeholder="请选择">
+                  <el-option
+                    v-for="item in dataList.custodianId"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="保管位置" prop="storageLocation">
+                <el-input v-model="form.storageLocation" placeholder="保管位置"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <el-form-item label="备注" prop="remark">
+                <el-input v-model="form.remark" placeholder="备注"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div style="padding-right: 10px">
+          <c-upload :list="tEnclosure" ref="cUpload" :disabled="disabled"></c-upload>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submitData('ruleForm')">保存</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Cookies from 'js-cookie'
+import { select } from '@/api/system/set'
+import moment from 'moment/moment'
+import { listQuery, submit, viewSingle ,confirmDeletion} from '@/api/contractManagement'
+import { listDept } from '@/api/system/dept'
+import { getliable } from '@/api/project'
+import { corpsList } from '@/api/costManagement'
+import cUpload from '@/components/cUpload/index.vue'
+export default {
+  name: 'index',
+  components: {
+    cUpload
+  },
+  data() {
+    return {
+      form: {},
+      tEnclosure: [],
+      disabled: false,
+      rules: {
+        custodianId: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        creationDate: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        contractNo: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        submittingDepartmentId: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        issuingUnitId: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }]
+      },
+      dialogVisible: false,
+      searchWhether: true,
+      formOption: [
+        {
+          span: 6,
+          label: 'contractNo',
+          name: '档案编号',
+          inputType: 2,
+          width: 200,
+          labelSize: '80',
+          rules: [{ required: false, message: ' ' }]
+        }, {
+          span: 6,
+          label: 'creationDateList',
+          name: '建立日期',
+          inputType: 3,
+          width: 300,
+          labelSize: '80',
+          rules: [{ required: false, message: ' ' }]
+        }, {
+          span: 6,
+          label: 'archiveTimeList',
+          name: '归档时间',
+          inputType: 3,
+          width: 300,
+          labelSize: '80',
+          rules: [{ required: false, message: ' ' }]
+        }, {
+          span: 6,
+          label: 'fileType',
+          name: '文件类型',
+          inputType: 1,
+          width: 200,
+          labelSize: '80',
+          rules: [{ required: false, message: ' ' }]
+        }, {
+          span: 6,
+          label: 'submittingDepartmentId',
+          name: '提交部门',
+          inputType: 1,
+          width: 200,
+          labelSize: '80',
+          rules: [{ required: false, message: ' ' }]
+        }, {
+          span: 6,
+          label: 'issuingUnitId',
+          name: '签发单位',
+          inputType: 1,
+          width: 200,
+          labelSize: '80',
+          rules: [{ required: false, message: ' ' }]
+        }, {
+          span: 6,
+          label: 'custodianId',
+          name: '保管人',
+          inputType: 1,
+          width: 200,
+          labelSize: '80',
+          rules: [{ required: false, message: ' ' }]
+        }],
+      dataList: {
+        fileType: [],
+        submissionMethod: [],
+        submittingDepartmentId: [],
+        custodianId: [],
+        issuingUnitId: []
+      },
+      inDex: 4,
+      search: {
+        pageNum: 1,
+        pageSize: 10
+      },
+      tableData: [],
+      hasPermi: {
+        lookup: ['anpin:stockControl:query'],
+        disappear: ['anpin:stockControl:remove']
+      },
+      isItHidden: true,
+      customButton: [
+        {
+          type: 'primary',
+          size: 'mini',
+          icon: 'el-icon-edit',
+          name: '新单',
+          disabled: false
+        }
+      ],
+      listStyle: [
+        {
+          surface: '1',
+          label: 'serialNumber',
+          name: '序号',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        }, {
+          surface: '2',
+          label: 'contractNo',
+          name: '档案编号',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        }, {
+          surface: '3',
+          label: 'creationDate',
+          name: '建立日期',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        }, {
+          surface: '4',
+          label: 'content',
+          name: '档案内容',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        }, {
+          surface: '5',
+          label: 'fileTypeName',
+          name: '文件类型',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        }, {
+          surface: '6',
+          label: 'copies',
+          name: '档案份数',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        }, {
+          surface: '7',
+          label: 'submissionMethodName',
+          name: '提交方式',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        }, {
+          surface: '8',
+          label: 'issuingUnitName',
+          name: '签发单位',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        }, {
+          surface: '9',
+          label: 'validityMonth',
+          name: '有效期',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        }, {
+          surface: '10',
+          label: 'archiveTime',
+          name: '归档时间',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        }, {
+          surface: '11',
+          label: 'submittingDepartmentName',
+          name: '提交部门',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        }, {
+          surface: '12',
+          label: 'storagePeriodTime',
+          name: '保管期限',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        }, {
+          surface: '13',
+          label: 'custodianName',
+          name: '保管人',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        }, {
+          surface: '14',
+          label: 'storageLocation',
+          name: '保管位置',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        }, {
+          surface: '15',
+          label: 'remark',
+          name: '备注',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        },
+        {
+          surface: '16',
+          label: 'operation',
+          name: '操作',
+          checked: 0,
+          width: 160,
+          fixed: 'right',
+          operation: '1',
+          onabort: ''
+        }
+      ],
+      queryList: {
+        tableName: '合同管理',
+        columnList: []
+      },
+      setRowList: [],
+      total: 0
+    }
+  },
+  created() {
+    let data = {
+      tableName: this.queryList.tableName,
+      userId: Cookies.get('userName')
+    }
+    this.getDicts('file_type').then(res => {
+      for (let item in res.data) {
+        this.dataList.fileType.push({
+          label: res.data[item].dictLabel,
+          value: res.data[item].dictValue
+        })
+      }
+    })
+    this.getDicts('submission_method').then(res => {
+      for (let item in res.data) {
+        this.dataList.submissionMethod.push({
+          label: res.data[item].dictLabel,
+          value: res.data[item].dictValue
+        })
+      }
+    })
+    listDept().then(res => {
+      for (let item in res.data) {
+        this.dataList.submittingDepartmentId.push({
+          label: res.data[item].deptName,
+          value: JSON.parse(res.data[item].deptId)
+        })
+      }
+    })
+    getliable().then((res) => {
+      for (let item in res.rows) {
+        this.dataList.custodianId.push({
+          label: res.rows[item].userName,
+          value: res.rows[item].userId
+        })
+      }
+    })
+    corpsList({ fTypeid: 205 }).then(res => {
+      for (let item in res.rows) {
+        this.dataList.issuingUnitId.push({
+          label: res.rows[item].fName,
+          value: JSON.parse(res.rows[item].fId)
+        })
+      }
+    })
+    this.query(this.search)
+    this.getRow(data)
+  },
+  methods: {
+    //表单验证通过执行搜索
+    submitForm() {
+      let data = this.search
+      this.search = {
+        ...this.$refs.avatar.form,
+        ...data
+      }
+      this.query({ ...this.search,...this.$refs.avatar.form })
+    },
+    submitData(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          let formData = new window.FormData()
+          formData.append('tContractManagement', JSON.stringify(this.form))
+          formData.append('tEnclosure', JSON.stringify(this.tEnclosure))
+          submit(formData).then(res => {
+            this.$message.success("保存成功")
+            this.dialogVisible = false
+            this.query(this.search)
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    //查询主页列数据
+    query(data) {
+      listQuery(data).then(res => {
+        this.tableData = res.rows
+        this.total = res.total
+      })
+    },
+    //选择框
+    selectionbox(selection) {
+      if (selection.length > 1) {
+        this.customButton.forEach(item => {
+          if (item.name === '复制新单') {
+            item.disabled = true
+          } else {
+            item.disabled = false
+          }
+        })
+      } else {
+        this.customButton.forEach(item => item.disabled = false)
+        this.selection = selection
+      }
+    },
+    //查看-列表
+    viewMethod(scope, res, i) {
+      viewSingle(scope.row.fId).then(res=>{
+        this.form = res.data.tContractManagement
+        this.tEnclosure = res.data.tEnclosure
+        this.dialogVisible = true
+      })
+    },
+    //删除
+    deletion(scope) {
+      this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        confirmDeletion(scope.row.fId).then(data => {
+          this.$message({
+            type: 'success',
+            message: '删除成功!'
+          })
+          this.query(this.search)
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    //所有按钮
+    buttonList(row) {
+      switch (row.name) {
+        case '新单':
+          this.form = {}
+          this.tEnclosure = []
+          this.dialogVisible = true
+          break
+        default:
+          this.$message.error('该按钮暂无功能')
+      }
+    },
+    // 显示搜索条件、点击后会调用此方法
+    showSearch() {
+      console.log('到我了')
+      this.searchWhether = !this.searchWhether
+    },
+    //搜索、重置、展开
+    feedback(res) {
+      if (res == '展开') {
+        if (this.inDex == 4) {
+          this.inDex = this.formOption.length
+        } else {
+          this.inDex = 4
+        }
+      } else if (res == '搜索') {
+        this.$refs.avatar.submitForm()
+      } else if (res == '重置') {
+        this.search = {
+          pageNum: 1,
+          pageSize: 10,
+          timeInterval: null,
+          fBilltype: 'HT'
+        }
+        this.$refs.avatar.assignmentTime(this.search)
+        this.$refs.avatar.submitForm()
+      }
+    },
+    //点击刷新会调用此方法
+    getList() {
+      this.feedback('重置')
+      this.submitForm()
+      console.log('到我了2')
+    },
+    //查询列数据
+    getRow(data, list, add, i) {
+      console.log(data)
+      select(data).then((res) => {
+        this.$refs.avatar.form = {}
+        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)
+          // this.waitFor = true
+        } else {
+          this.$set(this.queryList, 'columnList', this.$options.data().listStyle)
+          this.setRowList = this.$options.data().listStyle
+        }
+        this.pageDisplay = true
+        this.isItHidden = true
+        this.inDex = 4
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.el-form-item {
+  margin-bottom: 1px;
+}
+
+::v-deep .el-input-number .el-input__inner {
+  text-align: left !important;
+}
+</style>

+ 50 - 36
src/views/costManagement/index.vue

@@ -20,7 +20,7 @@
         @showSearch="showSearch"
         @feedback="feedback"
         @getList="getList"
-        :tatolLabel="['金额']"
+        :tatolLabel="['金额合计']"
         :hasPermi="hasPermi"
         :isItHidden="isItHidden"
         :customButton="customButton"
@@ -266,7 +266,11 @@ export default {
       dataList: {
         itemExpenseId: [],
         businessType: [],
-        expenseType: []
+        expenseType: [],
+        createDept: [],
+        itemPersonnel: [],
+        createById: [],
+        itemDepartment: []
       },
       tEnclosure:[],
       contentList: [],
@@ -484,13 +488,15 @@ export default {
           name: '保存',
           plain: true,
           disabled: false
-        }, {
-          type: 'primary',
-          size: 'mini',
-          icon: 'el-icon-edit-outline',
-          name: '请核',
-          disabled: false
-        }, {
+        }
+        // , {
+        //   type: 'primary',
+        //   size: 'mini',
+        //   icon: 'el-icon-edit-outline',
+        //   name: '请核',
+        //   disabled: false
+        // }
+        , {
           type: 'primary',
           size: 'mini',
           icon: 'el-icon-plus',
@@ -552,25 +558,17 @@ export default {
           rules: [{ required: false, message: ' ' }]
         }, {
           span: 6,
-          label: 'createBy',
-          name: '申请人',
-          inputType: 2,
-          width: 200,
-          labelSize: '80',
-          rules: [{ required: false, message: ' ' }]
-        }, {
-          span: 6,
-          label: 'moneys',
+          label: 'createDept',
           name: '制单部门',
-          inputType: 2,
+          inputType: 1,
           width: 200,
           labelSize: '80',
           rules: [{ required: false, message: ' ' }]
         }, {
           span: 6,
-          label: 'createBy',
+          label: 'createById',
           name: '制单人',
-          inputType: 2,
+          inputType: 1,
           width: 200,
           labelSize: '80',
           rules: [{ required: false, message: ' ' }]
@@ -584,23 +582,23 @@ export default {
           rules: [{ required: false, message: ' ' }]
         }, {
           span: 6,
-          label: 'itemDepartmentName',
+          label: 'itemDepartment',
           name: '所属部门',
-          inputType: 2,
+          inputType: 1,
           width: 200,
           labelSize: '80',
           rules: [{ required: false, message: ' ' }]
         }, {
           span: 6,
-          label: 'itemPersonnelName',
+          label: 'itemPersonnel',
           name: '所属人员',
-          inputType: 2,
+          inputType: 1,
           width: 200,
           labelSize: '80',
           rules: [{ required: false, message: ' ' }]
         }, {
           span: 6,
-          label: 'matterName',
+          label: 'itemMatterName',
           name: '物料',
           inputType: 2,
           width: 200,
@@ -724,7 +722,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)
     treeselect().then(response => {
@@ -736,6 +734,14 @@ export default {
           label: res.data[item].deptName,
           value: JSON.parse(res.data[item].deptId)
         })
+        this.dataList.createDept.push({
+          label: res.data[item].deptName,
+          value: JSON.parse(res.data[item].deptId)
+        })
+        this.dataList.itemDepartment.push({
+          label: res.data[item].deptName,
+          value: JSON.parse(res.data[item].deptId)
+        })
       }
     })
     getliable().then((res) => {
@@ -744,6 +750,14 @@ export default {
           label: res.rows[item].userName,
           value: res.rows[item].userId,
         });
+        this.dataList.itemPersonnel.push({
+          label: res.rows[item].userName,
+          value: res.rows[item].userId,
+        });
+        this.dataList.createById.push({
+          label: res.rows[item].userName,
+          value: res.rows[item].userId,
+        });
       }
     });
     corpsList({ fTypeid: 205 }).then(res => {
@@ -760,6 +774,10 @@ export default {
           label: res.data[item].fName,
           value: JSON.parse(res.data[item].fId)
         })
+        this.dataList.itemExpenseId.push({
+          label: res.data[item].fName,
+          value: JSON.parse(res.data[item].fId)
+        })
       }
     })
     this.getDicts('expense_business_type').then(res => {
@@ -958,12 +976,6 @@ export default {
           this.pageDisplay = true
           this.isItHidden = true
           this.inDex = 4
-          let y = moment(Date.parse(new Date())).format('YYYY-MM-DD')
-          if (this.formDataList.timeInterval === undefined) {
-            this.$set(this.formDataList, 'timeInterval', [y + ' 00:00:00', y + ' 23:59:59'])
-          } else {
-            this.$set(this.formDataList, 'timeInterval', this.formDataList.timeInterval)
-          }
           this.$refs.avatar.assignmentTime(this.formDataList)
         }
         if (list) {
@@ -1051,7 +1063,6 @@ export default {
         this.contentStyle.forEach(item => item.disabled = true)
       }
       viewSingle(scope.row.fId).then(res => {
-        console.log(res)
         if (res.code === 200) {
           let data = {
             tableName: this.purchaseList.tableName,
@@ -1150,6 +1161,7 @@ export default {
           this.$refs.avatar.form.fBillstatus = 2
           this.$refs.avatar.form.fPrint = 0
           this.contentList.forEach(item => item.fId = '')
+          this.tEnclosure = []
           this.contentOption.forEach(item => {
             if (item.label == 'createDeptName' || item.label == 'createBy' || item.label == 'createTime' || item.label == 'totalAmount') {
               item.disabled = true
@@ -1157,6 +1169,8 @@ export default {
               item.disabled = false
             }
           })
+          this.disabled = false
+          this.$message.success("操作成功")
           this.purchaseList.columnList.forEach(item => item.disabled = false)
           this.contentButton.forEach(item => item.disabled = false)
           this.contentStyle.forEach(item => item.disabled = false)
@@ -1589,12 +1603,12 @@ export default {
     //表单验证通过执行搜索
     submitForm() {
       let list = this.formDataList
-      console.log(this.$refs.avatar.form)
+      // console.log(this.$refs.avatar.form)
       this.formDataList = this.$refs.avatar.form
       this.formDataList.fBilltype = list.fBilltype
       this.formDataList.pageSize = list.pageSize
       this.formDataList.pageNum = list.pageNum
-      this.formDataList.timeInterval = list.timeInterval
+      // this.formDataList.timeInterval = list.timeInterval
       this.query(this.formDataList)
     },
     //点击刷新会调用此方法