add:页面

2025-12-01 11:04:35 +08:00
parent ae280d1858
commit 20427934b5
48 changed files with 1905 additions and 586 deletions
--- a/base-vue/src/main.js
+++ b/base-vue/src/main.js
@@ -24,7 +24,7 @@ import './style/bpmn-custom-color.css' // 导入自定义的样式文件
 Vue.prototype.$echarts = echarts;
 Vue.use(VueCookie)
 Vue.use(ElementUI)
-Vue.config.productionTip = false
+Vue.config.productionTip = true

 // 非生产环境, 适配mockjs模拟数据                 // api: https://github.com/nuysoft/Mock
 if (process.env.NODE_ENV !== 'production') {
--- a/base-vue/src/views/common/UploadDialog.vue
+++ b/base-vue/src/views/common/UploadDialog.vue
@@ -0,0 +1,128 @@
+<template>
+  <el-dialog
+    title="导入Excel文件"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="400px"
+    :show-close="true"
+    @close="close"
+    @open="open"
+  >
+    <el-upload
+      ref="upload"
+      class="upload-demo"
+      action=""
+      drag
+      :on-exceed="is_one"
+      :limit="1"
+      :auto-upload="false"
+      :multiple="false"
+      :show-file-list="true"
+      :on-change="uploadByJsqd"
+      :file-list="fileList"
+      accept=".xlsx,.xls"
+    >
+      <i class="el-icon-upload" />
+      <div class="el-upload__text">
+        将文件拖到此处，或
+        <em>点击上传</em>
+      </div>
+      <div slot="tip" class="el-upload__tip">只能上传Excel文件，且不超过10MB</div>
+    </el-upload>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="close()">取 消</el-button>
+      <el-button type="primary" @click="submit">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: 'UploadDialog',
+  mixins: [],
+  components: {},
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    openParam: {
+      type: String
+    },
+    urlApi: ''
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      fileList: [],
+      file1: ''
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    },
+    openParam: {
+      handler(newValue, oldValue) {
+        this.opendtlParam = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+    },
+    close() {
+      this.$emit('update:dialogShow', false)
+    },
+    is_one() {
+      this.$message.error('只能上传一个excel文件！')
+    },
+    // 文件校验方法
+    beforeAvatarUpload(file) {
+      // 不能导入大小超过2Mb的文件
+      if (file.size > 10 * 1024 * 1024) {
+        return false
+      }
+      return true
+    },
+    // 文件发生改变就会触发的事件
+    uploadByJsqd (file) {
+      this.file1 = file
+    },
+    submit () {
+      if (this.beforeAvatarUpload(this.file1)) {
+        this.fileList.name = this.file1.name
+        this.fileList.url = ''
+        var formdata = new FormData()
+        formdata.append('file', this.file1.raw)
+        // excelImport：请求接口 formdata：传递参数
+        debugger
+        this.$http({
+          url: this.$http.adornUrl(this.urlApi),
+          method: 'post',
+          data: formdata
+        }).then(({data}) => {
+          if (data && data.code === 0) {
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+                this.visible = false
+                this.$emit('refreshDataList')
+              }
+            })
+            this.$emit('event-close', false)
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
+      }
+    }
+  }
+}
+</script>
+
--- a/base-vue/src/views/modules/aftersales/aftersales-add-or-update.vue
+++ b/base-vue/src/views/modules/aftersales/aftersales-add-or-update.vue
@@ -227,10 +227,10 @@
            width="50">
          </el-table-column>
          <el-table-column
-            prop="materialId"
+            type="index"
            header-align="center"
            align="center"
-            label="id">
+            label="序号">
          </el-table-column>
          <el-table-column
            prop="materialCode"
--- a/base-vue/src/views/modules/car/car.vue
+++ b/base-vue/src/views/modules/car/car.vue
@@ -2,7 +2,7 @@
  <div class="mod-config">
    <el-form :inline="true" :model="dataForm" size="mini" @keyup.enter.native="getDataList()">
      <el-form-item>
-        <el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+        <el-input v-model="dataForm.key" placeholder="车辆名称" clearable></el-input>
      </el-form-item>
      <el-form-item>
        <el-button @click="getDataList()">查询</el-button>
@@ -24,10 +24,10 @@
        width="50">
      </el-table-column>
      <el-table-column
-        prop="carId"
+        type="index"
        header-align="center"
        align="center"
-        label="ID">
+        label="序号">
      </el-table-column>
      <el-table-column
        prop="carName"
--- a/base-vue/src/views/modules/client/client.vue
+++ b/base-vue/src/views/modules/client/client.vue
@@ -2,7 +2,7 @@
  <div class="mod-config">
    <el-form :inline="true" :model="dataForm" size="mini" @keyup.enter.native="getDataList()">
      <el-form-item>
-        <el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+        <el-input v-model="dataForm.key" placeholder="客户名称" clearable></el-input>
      </el-form-item>
      <el-form-item>
        <el-button @click="getDataList()">查询</el-button>
@@ -24,10 +24,10 @@
        width="50">
      </el-table-column>
      <el-table-column
-        prop="clientId"
+        type="index"
        header-align="center"
        align="center"
-        label="ID">
+        label="序号">
      </el-table-column>
      <el-table-column
        prop="clientName"
--- a/base-vue/src/views/modules/contract/contract-add-or-update.vue
+++ b/base-vue/src/views/modules/contract/contract-add-or-update.vue
@@ -227,10 +227,10 @@
            width="50">
          </el-table-column>
          <el-table-column
-            prop="materialId"
+            type="index"
            header-align="center"
            align="center"
-            label="id">
+            label="序号">
          </el-table-column>
          <el-table-column
            prop="materialCode"
--- a/base-vue/src/views/modules/knowledge/knowledge.vue
+++ b/base-vue/src/views/modules/knowledge/knowledge.vue
@@ -24,10 +24,10 @@
        width="50">
      </el-table-column>
      <el-table-column
-        prop="materialId"
+        type="index"
        header-align="center"
        align="center"
-        label="ID">
+        label="序号">
      </el-table-column>
      <el-table-column
        prop="materialType"
--- a/base-vue/src/views/modules/material/material.vue
+++ b/base-vue/src/views/modules/material/material.vue
@@ -2,11 +2,12 @@
  <div class="mod-config">
    <el-form :inline="true" :model="dataForm" size="mini" @keyup.enter.native="getDataList()">
      <el-form-item>
-        <el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+        <el-input v-model="dataForm.key" placeholder="物料编码,名称或规格" clearable></el-input>
      </el-form-item>
      <el-form-item>
        <el-button @click="getDataList()">查询</el-button>
        <el-button v-if="isAuth('material:material:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+        <el-button type="primary" @click="uploadShow = true">导入</el-button>
        <el-button v-if="isAuth('material:material:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
      </el-form-item>
    </el-form>
@@ -24,10 +25,10 @@
        width="50">
      </el-table-column>
      <el-table-column
-        prop="materialId"
+        type="index"
        header-align="center"
        align="center"
-        label="ID">
+        label="序号">
      </el-table-column>
      <el-table-column
        prop="materialCode"
@@ -71,10 +72,16 @@
        </template>
      </el-table-column>
      <el-table-column
-        prop="createTime"
+        prop="updateTime"
        header-align="center"
        align="center"
-        label="创建时间">
+        label="操作人">
+      </el-table-column>
+      <el-table-column
+        prop="updateName"
+        header-align="center"
+        align="center"
+        label="操作人">
      </el-table-column>
      <el-table-column
        fixed="right"
@@ -99,18 +106,22 @@
    </el-pagination>
    <!-- 弹窗, 新增 / 修改 -->
    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :dictData="dictData" @refreshDataList="getDataList"></add-or-update>
+    <UploadDialog :dialog-show.sync="uploadShow" @event-close="closeUpload" urlApi='/material/material/importExcel' />
+
  </div>
 </template>

 <script>
  import AddOrUpdate from './material-add-or-update'
  import { apiUtils } from '@/utils/dict'
+  import UploadDialog from '../../common/UploadDialog'
  export default {
    data () {
      return {
        dataForm: {
          key: ''
        },
+        uploadShow: false,
        dataList: [],
        pageIndex: 1,
        pageSize: 10,
@@ -124,7 +135,7 @@
    },
    mixins: [apiUtils],
    components: {
-      AddOrUpdate
+      AddOrUpdate, UploadDialog
    },
    activated () {
      this.getDataList()
@@ -152,6 +163,10 @@
          this.dataListLoading = false
        })
      },
+      closeUpload () {
+        this.uploadShow = false
+        this.getDataList()
+      },
      // 每页数
      sizeChangeHandle (val) {
        this.pageSize = val
--- a/base-vue/src/views/modules/material/物料导入模版.xlsx
+++ b/base-vue/src/views/modules/material/物料导入模版.xlsx
--- a/base-vue/src/views/modules/materialprice/material-add-or-update.vue
+++ b/base-vue/src/views/modules/materialprice/material-add-or-update.vue
@@ -0,0 +1,127 @@
+<template>
+  <el-dialog
+    :title="!dataForm.materialId ? '新增' : '修改'"
+    :close-on-click-modal="false"
+    :visible.sync="visible"
+    width="500px">
+    <el-form :model="dataForm" :rules="dataRule" size="mini" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+    <el-form-item label="物料编码" prop="materialCode">
+      <el-input disabled v-model="dataForm.materialCode" placeholder="物料编码"></el-input>
+    </el-form-item>
+    <el-form-item label="物料名称" prop="materialName">
+      <el-input disabled v-model="dataForm.materialName" placeholder="物料名称"></el-input>
+    </el-form-item>
+    <el-form-item label="物料规格" prop="materialSpec">
+      <el-input disabled v-model="dataForm.materialSpec" placeholder="物料名称"></el-input>
+    </el-form-item>
+      <el-form-item label="成本价" prop="costPrice">
+        <el-input-number precision="2" v-model="dataForm.costPrice" placeholder="成本价"></el-input-number>
+      </el-form-item>
+      <el-form-item label="销售价" prop="salePrice">
+        <el-input-number precision="2" v-model="dataForm.salePrice" placeholder="销售价"></el-input-number>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button size="mini" @click="visible = false">取消</el-button>
+      <el-button size="mini" type="primary" @click="dataFormSubmit()">确定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        visible: false,
+        dataForm: {
+          materialId: 0,
+          materialCode: '',
+          materialName: '',
+          materialSpec: '',
+          costPrice: '',
+          salePrice: '',
+          unitName: '',
+          materialType: '',
+          isOn: 0
+        },
+        dataRule: {
+          materialCode: [
+            { required: true, message: '物料编码不能为空', trigger: 'blur' }
+          ],
+          materialName: [
+            { required: true, message: '物料名称不能为空', trigger: 'blur' }
+          ],
+          materialType: [
+            { required: true, message: '物料类型不能为空', trigger: 'blur' }
+          ]
+        }
+      }
+    },
+    props: {
+      dictData: Array
+    },
+    methods: {
+      init (id) {
+        this.dataForm.materialId = id || 0
+        this.visible = true
+        this.$nextTick(() => {
+          this.$refs['dataForm'].resetFields()
+          if (this.dataForm.materialId) {
+            this.$http({
+              url: this.$http.adornUrl(`/material/material/info/${this.dataForm.materialId}`),
+              method: 'get',
+              params: this.$http.adornParams()
+            }).then(({data}) => {
+              if (data && data.code === 0) {
+                this.dataForm.materialCode = data.material.materialCode
+                this.dataForm.materialName = data.material.materialName
+                this.dataForm.unitName = data.material.unitName
+                this.dataForm.costPrice = data.material.costPrice
+                this.dataForm.salePrice = data.material.salePrice
+                this.dataForm.materialSpec = data.material.materialSpec
+                this.dataForm.materialType = String(data.material.materialType)
+                this.dataForm.isOn = data.material.isOn
+              }
+            })
+          }
+        })
+      },
+      // 表单提交
+      dataFormSubmit () {
+        this.$refs['dataForm'].validate((valid) => {
+          if (valid) {
+            this.$http({
+              url: this.$http.adornUrl(`/materialPrice/${!this.dataForm.materialId ? 'save' : 'update'}`),
+              method: 'post',
+              data: this.$http.adornData({
+                'materialId': this.dataForm.materialId || undefined,
+                'materialCode': this.dataForm.materialCode,
+                'materialName': this.dataForm.materialName,
+                'materialSpec': this.dataForm.materialSpec,
+                'costPrice': this.dataForm.costPrice,
+                'salePrice': this.dataForm.salePrice,
+                'unitName': this.dataForm.unitName,
+                'materialType': this.dataForm.materialType,
+                'isOn': this.dataForm.isOn
+              })
+            }).then(({data}) => {
+              if (data && data.code === 0) {
+                this.$message({
+                  message: '操作成功',
+                  type: 'success',
+                  duration: 1500,
+                  onClose: () => {
+                    this.visible = false
+                    this.$emit('refreshDataList')
+                  }
+                })
+              } else {
+                this.$message.error(data.msg)
+              }
+            })
+          }
+        })
+      }
+    }
+  }
+</script>
--- a/base-vue/src/views/modules/materialprice/materialprice.vue
+++ b/base-vue/src/views/modules/materialprice/materialprice.vue
@@ -0,0 +1,224 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true" :model="dataForm" size="mini" @keyup.enter.native="getDataList()">
+      <el-form-item>
+        <el-input v-model="dataForm.key" placeholder="物料编码,名称或规格" clearable></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="getDataList()">查询</el-button>
+<!--        <el-button v-if="isAuth('material:material:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>-->
+        <el-button type="primary" @click="uploadShow = true">导入</el-button>
+<!--        <el-button v-if="isAuth('material:material:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>-->
+      </el-form-item>
+    </el-form>
+    <el-table
+      :data="dataList"
+      border
+      size="mini"
+      v-loading="dataListLoading"
+      @selection-change="selectionChangeHandle"
+      style="width: 100%;">
+      <el-table-column
+        type="selection"
+        header-align="center"
+        align="center"
+        width="50">
+      </el-table-column>
+      <el-table-column
+        type="index"
+        header-align="center"
+        align="center"
+        label="序号">
+      </el-table-column>
+      <el-table-column
+        prop="materialCode"
+        header-align="center"
+        align="center"
+        label="物料编码">
+        <template slot-scope="scope">
+          <el-link type="warning" @click="toView( scope.row.materialCode)">{{ scope.row.materialCode }}</el-link>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="materialName"
+        header-align="center"
+        align="center"
+        label="物料名称">
+      </el-table-column>
+      <el-table-column
+        prop="materialSpec"
+        header-align="center"
+        align="center"
+        label="物料规格">
+      </el-table-column>
+      <el-table-column
+        prop="costPrice"
+        header-align="center"
+        align="center"
+        label="成本价">
+      </el-table-column>
+      <el-table-column
+        prop="salePrice"
+        header-align="center"
+        align="center"
+        label="销售价">
+      </el-table-column>
+      <el-table-column
+        prop="updateTime"
+        header-align="center"
+        align="center"
+        label="操作时间">
+      </el-table-column>
+      <el-table-column
+        prop="updateName"
+        header-align="center"
+        align="center"
+        label="操作人">
+      </el-table-column>
+      <el-table-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="150"
+        label="操作">
+        <template slot-scope="scope">
+          <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.materialId)">修改</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[10, 20, 50, 100]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+    <!-- 弹窗, 新增 / 修改 -->
+    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :dictData="dictData" @refreshDataList="getDataList"></add-or-update>
+    <UploadDialog :dialog-show.sync="uploadShow" @event-close="closeUpload" urlApi='/material/material/importExcel' />
+    <PriceList ref="priceList" :dialog-show.sync="priceView"  @refreshDataList="getDataList"/>
+
+  </div>
+</template>
+
+<script>
+import AddOrUpdate from './material-add-or-update'
+import { apiUtils } from '@/utils/dict'
+import UploadDialog from '../../common/UploadDialog'
+import PriceList from './price-list'
+
+export default {
+  data () {
+    return {
+      dataForm: {
+        key: ''
+      },
+      uploadShow: false,
+      dataList: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPage: 0,
+      dataListLoading: false,
+      dataListSelections: [],
+      addOrUpdateVisible: false,
+      priceView: false,
+      dictConfigs: [{type: 'dict', code: 'material_type'}],
+      dictData: []
+    }
+  },
+  mixins: [apiUtils],
+  components: {
+    AddOrUpdate, UploadDialog, PriceList
+  },
+  activated () {
+    this.getDataList()
+  },
+  methods: {
+    // 获取数据列表
+    toView (materialCode) {
+      this.$nextTick(() => {
+        this.$refs.priceList.init(materialCode)
+      })
+    },
+    getDataList () {
+      this.dataListLoading = true
+      this.$http({
+        url: this.$http.adornUrl('/material/material/list'),
+        method: 'get',
+        params: this.$http.adornParams({
+          'page': this.pageIndex,
+          'limit': this.pageSize,
+          'key': this.dataForm.key
+        })
+      }).then(({data}) => {
+        if (data && data.code === 0) {
+          this.dataList = data.page.list
+          this.totalPage = data.page.totalCount
+        } else {
+          this.dataList = []
+          this.totalPage = 0
+        }
+        this.dataListLoading = false
+      })
+    },
+    closeUpload () {
+      this.uploadShow = false
+      this.getDataList()
+    },
+    // 每页数
+    sizeChangeHandle (val) {
+      this.pageSize = val
+      this.pageIndex = 1
+      this.getDataList()
+    },
+    // 当前页
+    currentChangeHandle (val) {
+      this.pageIndex = val
+      this.getDataList()
+    },
+    // 多选
+    selectionChangeHandle (val) {
+      this.dataListSelections = val
+    },
+    // 新增 / 修改
+    addOrUpdateHandle (id) {
+      this.addOrUpdateVisible = true
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(id)
+      })
+    },
+    // 删除
+    deleteHandle (id) {
+      var ids = id ? [id] : this.dataListSelections.map(item => {
+        return item.materialId
+      })
+      this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.$http({
+          url: this.$http.adornUrl('/material/material/delete'),
+          method: 'post',
+          data: this.$http.adornData(ids, false)
+        }).then(({data}) => {
+          if (data && data.code === 0) {
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+                this.getDataList()
+              }
+            })
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
+      }).catch(() => {})
+    }
+  }
+}
+</script>
--- a/base-vue/src/views/modules/materialprice/price-list.vue
+++ b/base-vue/src/views/modules/materialprice/price-list.vue
@@ -0,0 +1,171 @@
+<template>
+  <el-dialog
+    :title="维护记录"
+    :close-on-click-modal="false"
+    :visible.sync="priceView">
+    <el-table
+      :data="dataList"
+      border
+      size="mini"
+      max-height="400"
+      style="width: 100%;">
+      <el-table-column
+        type="index"
+        header-align="center"
+        align="center"
+        label="序号">
+      </el-table-column>
+      <el-table-column
+        prop="materialCode"
+        header-align="center"
+        align="center"
+        label="物料编码">
+      </el-table-column>
+      <el-table-column
+        prop="costPrice"
+        header-align="center"
+        align="center"
+        label="成本价">
+      </el-table-column>
+      <el-table-column
+        prop="salePrice"
+        header-align="center"
+        align="center"
+        label="销售价">
+      </el-table-column>
+      <el-table-column
+        prop="createTime"
+        header-align="center"
+        align="center"
+        label="创建时间">
+      </el-table-column>
+      <el-table-column
+        prop="createName"
+        header-align="center"
+        align="center"
+        label="创建人">
+      </el-table-column>
+      <el-table-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="150"
+        label="操作">
+        <template slot-scope="scope">
+          <el-button type="text" size="small" @click="usePrice(scope.row)">启用</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[10, 20, 50, 100]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+    <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="closeView">关闭</el-button>
+      </span>
+  </el-dialog>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        priceView: false,
+        materialCode: '',
+        dataList: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPage: 0,
+        headers: { 'Token': this.$cookie.get('token') }
+      }
+    },
+    methods: {
+      init (materialCode) {
+        this.dataList = []
+        this.materialCode = materialCode
+        this.priceView = true
+        this.$nextTick(() => {
+          this.$http({
+            url: this.$http.adornUrl(`/materialPrice/info`),
+            method: 'get',
+            params: this.$http.adornParams({
+              'page': this.pageIndex,
+              'size': this.pageSize,
+              'materialCode': materialCode
+            })
+          }).then(({data}) => {
+            if (data && data.code === 0) {
+              this.dataList = data.data
+              this.totalPage = data.total
+            }
+          })
+        })
+      },
+      // 表单提交
+      usePrice (price) {
+        this.$http({
+          url: this.$http.adornUrl(`/materialPrice/use`),
+          method: 'post',
+          data: price
+        }).then(({data}) => {
+            if (data && data.code === 0) {
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                  this.$refs.upload.clearFiles()
+                  this.activeName = 'first'
+                  this.visible = false
+                  this.$emit('refreshDataList')
+                }
+              })
+            } else {
+              this.$message.error(data.msg)
+            }
+        })
+      },
+      // 每页数
+      sizeChangeHandle (val) {
+        this.pageSize = val
+        this.pageIndex = 1
+        this.init(this.materialCode)
+      },
+      // 当前页
+      currentChangeHandle (val) {
+        this.pageIndex = val
+        this.init(this.materialCode)
+      },
+      closeView (val) {
+        // eslint-disable-next-line no-unused-expressions,no-sequences
+        this.priceView = false,
+        this.materialCode = '',
+        this.dataList = []
+        this.$emit('refreshDataList')
+      }
+    }
+  }
+</script>
+
+<style scoped>
+.tab_box_wraper {
+  width: 460px;
+}
+.file-item {
+  border: 1px solid #eee;
+  padding: 5px 8px 5px 15px;
+}
+.file-item-name {
+  font-size: 14px;
+  color: #333;
+}
+.el-pagination {
+  margin-top: 15px;
+  text-align: right;
+}
+</style>
--- a/base-vue/src/views/modules/price/price-add-or-update.vue
+++ b/base-vue/src/views/modules/price/price-add-or-update.vue
--- a/base-vue/src/views/modules/price/price.vue
+++ b/base-vue/src/views/modules/price/price.vue
@@ -150,7 +150,7 @@
        dataListSelections: [],
        addOrUpdateVisible: false,
        tempVisible: false,
-        dictConfigs: [{type: 'dict', code: 'contract_type'}, {url: '/client/client/list', type: 'list', value: 'clientId', label: 'clientName'}],
+        dictConfigs: [{type: 'dict', code: 'contract_type'}, {url: '/client/client/list', type: 'list', value: 'clientId', label: 'clientName'}, {url: '/sys/user/list', type: 'list', value: 'userId', label: 'username'}],
        statusOpt: [{value: '1', label: '未审核'}, {value: '2', label: '审核通过'}, {value: '3', label: '审核驳回'}]
      }
    },
--- a/base-vue/src/views/modules/project/contract/contract-add-or-update.vue
+++ b/base-vue/src/views/modules/project/contract/contract-add-or-update.vue
@@ -18,7 +18,7 @@
              </el-select>
            </el-form-item>
            <el-form-item label="合同编号" prop="contractNumber">
-              <el-input v-model="dataForm.contractNumber" placeholder="合同编号"></el-input>
+              <el-input  disabled v-model="dataForm.contractNumber" placeholder="系统生成"></el-input>
            </el-form-item>
            <el-form-item label="是否是主合同" prop="isMaster">
              <el-switch
@@ -243,10 +243,10 @@
            width="50">
          </el-table-column>
          <el-table-column
-            prop="materialId"
+            type="index"
            header-align="center"
            align="center"
-            label="id">
+            label="序号">
          </el-table-column>
          <el-table-column
            prop="materialCode"
@@ -314,9 +314,6 @@
          contractType: [
            { required: true, message: '合同类型不能为空', trigger: 'blur' }
          ],
-          contractNumber: [
-            { required: true, message: '合同编号不能为空', trigger: 'blur' }
-          ],
          clientId: [
            { required: true, message: '客户不能为空', trigger: 'blur' }
          ]
--- a/base-vue/src/views/modules/project/contract/contract.vue
+++ b/base-vue/src/views/modules/project/contract/contract.vue
@@ -1,8 +1,51 @@
 <template>
  <div class="mod-config">
    <el-form size="mini" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-      <el-form-item>
-        <el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+      <el-form-item label="客户名称">
+        <el-input  v-model="dataForm.clientName" placeholder="客户名称" clearable></el-input>
+      </el-form-item>
+      <el-form-item label="合同编号">
+        <el-input v-model="dataForm.contractNumber" placeholder="合同编号" clearable></el-input>
+      </el-form-item>
+      <el-form-item label="合同类型">
+        <el-select v-model="dataForm.contractType" placeholder="请选择合同类型" clearable>
+          <el-option
+            v-for="item in dictData[0]"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="合同日期">
+        <el-date-picker
+          v-model="dataForm.acceptanceTime"
+          type="daterange"
+          :default-time="['00:00:00', '23:59:59']"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="是否验收">
+        <el-select v-model="dataForm.isAcceptance" placeholder="是否验收" clearable>
+          <el-option
+            v-for="item in dictData[2]"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="是否在保">
+        <el-select v-model="dataForm.isValidity" placeholder="是否在保" clearable>
+          <el-option
+            v-for="item in dictData[2]"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
      </el-form-item>
      <el-form-item>
        <el-button @click="getDataList()">查询</el-button>
@@ -128,7 +171,12 @@
    data () {
      return {
        dataForm: {
-          key: ''
+          isValidity: null,
+          isAcceptance: null,
+          acceptanceTime: [],
+          contractType: null,
+          contractNumber: null,
+          clientName: null
        },
        dataList: [],
        pageIndex: 1,
@@ -138,7 +186,7 @@
        dataListSelections: [],
        addOrUpdateVisible: false,
        tempVisible: false,
-        dictConfigs: [{type: 'dict', code: 'contract_type'}, {url: '/client/client/list', type: 'list', value: 'clientId', label: 'clientName'}],
+        dictConfigs: [{type: 'dict', code: 'contract_type'}, {url: '/client/client/list', type: 'list', value: 'clientId', label: 'clientName'}, {type: 'dict', code: 'onoff'}],
      }
    },
    mixins: [apiUtils],
@@ -153,13 +201,26 @@
      // 获取数据列表
      getDataList () {
        this.dataListLoading = true
+        let startTime = null
+        let endTime = null
+        if (this.dataForm.acceptanceTime != null && this.dataForm.acceptanceTime.length > 1){
+          // eslint-disable-next-line no-unused-expressions
+          startTime = this.dataForm.acceptanceTime[0]
+          endTime = this.dataForm.acceptanceTime[1]
+        }
        this.$http({
          url: this.$http.adornUrl('/flow/projectContract/list'),
          method: 'get',
          params: this.$http.adornParams({
            'page': this.pageIndex,
            'limit': this.pageSize,
-            'key': this.dataForm.key
+            'isValidity': this.dataForm.isValidity,
+            'isAcceptance': this.dataForm.isAcceptance,
+            'startTime': startTime,
+            'endTime': endTime,
+            'contractType': this.dataForm.contractType,
+            'contractNumber': this.dataForm.contractNumber,
+            'clientName': this.dataForm.clientName
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
--- a/base-vue/src/views/modules/spare/spare.vue
+++ b/base-vue/src/views/modules/spare/spare.vue
@@ -24,10 +24,10 @@
        width="50">
      </el-table-column>
      <el-table-column
-        prop="materialId"
+        type="index"
        header-align="center"
        align="center"
-        label="ID">
+        label="序号">
      </el-table-column>
      <el-table-column
        prop="materialCode"
--- a/base-vue/src/views/modules/sys/config.vue
+++ b/base-vue/src/views/modules/sys/config.vue
@@ -23,11 +23,11 @@
        width="50">
      </el-table-column>
      <el-table-column
-        prop="id"
+        type="index"
        header-align="center"
        align="center"
        width="80"
-        label="ID">
+        label="序号">
      </el-table-column>
      <el-table-column
        prop="paramKey"
--- a/base-vue/src/views/modules/sys/log.vue
+++ b/base-vue/src/views/modules/sys/log.vue
@@ -15,11 +15,11 @@
      v-loading="dataListLoading"
      style="width: 100%">
      <el-table-column
-        prop="id"
+        type="index"
        header-align="center"
        align="center"
        width="80"
-        label="ID">
+        label="序号">
      </el-table-column>
      <el-table-column
        prop="username"
--- a/base-vue/src/views/modules/sys/role.vue
+++ b/base-vue/src/views/modules/sys/role.vue
@@ -24,11 +24,11 @@
        width="50">
      </el-table-column>
      <el-table-column
-        prop="roleId"
+        type="index"
        header-align="center"
        align="center"
        width="80"
-        label="ID">
+        label="序号">
      </el-table-column>
      <el-table-column
        prop="roleName"
--- a/base-vue/src/views/modules/sys/user.vue
+++ b/base-vue/src/views/modules/sys/user.vue
@@ -25,11 +25,11 @@
        width="50">
      </el-table-column>
      <el-table-column
-        prop="userId"
+        type="index"
        header-align="center"
        align="center"
        width="80"
-        label="ID">
+        label="序号">
      </el-table-column>
      <el-table-column
        prop="username"
--- a/base-vue/src/views/modules/sys/usermy.vue
+++ b/base-vue/src/views/modules/sys/usermy.vue
@@ -21,11 +21,11 @@
        width="50">
      </el-table-column>
      <el-table-column
-        prop="userId"
+        type="index"
        header-align="center"
        align="center"
        width="80"
-        label="ID">
+        label="序号">
      </el-table-column>
      <el-table-column
        prop="username"
--- a/base-vue/test/unit/setup.js
+++ b/base-vue/test/unit/setup.js
@@ -1,3 +1,3 @@
 import Vue from 'vue'

-Vue.config.productionTip = false
+Vue.config.productionTip = true