css

2025-03-14 17:56:05 +08:00
parent f932a49602
commit 0c9554125f
46 changed files with 665 additions and 461 deletions
--- a/base-vue/src/views/modules/contract/contract-add-or-update.vue
+++ b/base-vue/src/views/modules/contract/contract-add-or-update.vue
@@ -3,9 +3,9 @@
    :title="!dataForm.contractId ? '新增' : '修改'"
    :close-on-click-modal="false"
    :visible.sync="visible">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="100px" size="mini" label-position="left">
-      <el-row type="flex" justify="space-between">
-        <el-col :span="11">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="100px" size="mini">
+      <el-row>
+        <el-col :span="12">
          <el-form-item label="合同类型" prop="contractType">
            <el-select v-model="dataForm.contractType" placeholder="合同类型" style="width: 100%;">
              <el-option
@@ -17,35 +17,25 @@
            </el-select>
          </el-form-item>
        </el-col>
-        <el-col :span="11">
+        <el-col :span="12">
          <el-form-item label="合同编号" prop="contractNumber">
            <el-input v-model="dataForm.contractNumber" placeholder="合同编号"></el-input>
          </el-form-item>
        </el-col>
      </el-row>
-      <el-form-item label="是否是主合同" prop="isMaster">
-        <el-switch
-          v-model="dataForm.isMaster"
-          active-color="#409EFF"
-          inactive-color="#F56C6C"
-          :active-value="1"
-          :inactive-value="0"
-        />
-      </el-form-item>
-      <el-row type="flex" justify="space-between">
-        <el-col :span="11">
-          <el-form-item label="客户" prop="clientId">
-            <el-select v-model="dataForm.clientId" placeholder="客户" style="width: 100%;">
-              <el-option
-                v-for="item in clientIdOpt"
-                :key="item.clientId"
-                :label="item.clientName"
-                :value="item.clientId">
-              </el-option>
-            </el-select>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="是否是主合同" prop="isMaster">
+            <el-switch
+              v-model="dataForm.isMaster"
+              active-color="#409EFF"
+              inactive-color="#F56C6C"
+              :active-value="1"
+              :inactive-value="0"
+            />
          </el-form-item>
        </el-col>
-        <el-col :span="11">
+        <el-col :span="12">
          <el-form-item label="是否验收" prop="isAcceptance">
            <el-switch
              v-model="dataForm.isAcceptance"
@@ -58,17 +48,29 @@
        </el-col>
      </el-row>
      <el-row>
-        <el-col :span="11">
+        <el-col :span="12">
+          <el-form-item label="客户" prop="clientId">
+            <el-select v-model="dataForm.clientId" placeholder="客户" style="width: 100%;">
+              <el-option
+                v-for="item in clientIdOpt"
+                :key="item.clientId"
+                :label="item.clientName"
+                :value="item.clientId">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
          <el-form-item label="备注" prop="remarks">
            <el-input v-model="dataForm.remarks" placeholder="备注"></el-input>
          </el-form-item>
        </el-col>
      </el-row>
-      <el-row type="flex" justify="space-between">
-        <el-col :span="11">
+      <el-row>
+        <el-col :span="12">
          <el-button size="mini" type="primary" @click="addMaterial">选择物料</el-button>
        </el-col>
-        <el-col :span="11">
+        <el-col :span="12">
          <el-form-item label="总计">
            <el-input v-model="dataForm.totalSum" placeholder="总计" disabled></el-input>
          </el-form-item>
@@ -214,12 +216,6 @@
            align="center"
            label="是否启用">
          </el-table-column>
-          <el-table-column
-            prop="createTime"
-            header-align="center"
-            align="center"
-            label="创建时间">
-          </el-table-column>
        </el-table>
        <el-pagination
          @size-change="sizeChangeHandle"
@@ -244,8 +240,6 @@
      return {
        visible: false,
        innerVisible: false,
-        contractTypeOpt: [],
-        clientIdOpt: [],
        dataForm: {
          contractId: 0,
          contractType: '',
@@ -279,6 +273,10 @@
        materData: []
      }
    },
+    props: {
+      contractTypeOpt: Array,
+      clientIdOpt: Array
+    },
    watch: {
      materData: {
        deep: true,
@@ -287,24 +285,7 @@
        }
      }
    },
-    created () {
-      this.getDictDetail()
-    },
    methods: {
-      getDictDetail () {
-        this.$http({
-          url: this.$http.adornUrl('/api/dict/dictDetail?code=contract_type&page=0&size=9999'),
-          method: 'get'
-        }).then(({data}) => {
-          this.contractTypeOpt = [...data.content]
-        })
-        this.$http({
-          url: this.$http.adornUrl('/client/client/list?page=0&limit=9999'),
-          method: 'get'
-        }).then(({data}) => {
-          this.clientIdOpt = data.page.list
-        })
-      },
      init (id) {
        this.dataForm.contractId = id || 0
        this.visible = true
--- a/base-vue/src/views/modules/contract/contract.vue
+++ b/base-vue/src/views/modules/contract/contract.vue
@@ -8,7 +8,6 @@
        <el-button @click="getDataList()">查询</el-button>
        <el-button v-if="isAuth('tickets:contract:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
        <el-button v-if="isAuth('tickets:contract:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
-        <el-button type="primary" @click="addTempHandle">模板生成</el-button>
      </el-form-item>
    </el-form>
    <el-table
@@ -28,19 +27,42 @@
        prop="contractId"
        header-align="center"
        align="center"
-        label="id">
+        label="合同ID">
+        <template slot-scope="scope">
+          <el-popover
+            :content="'file/' + scope.row.type + '/' + scope.row.realName"
+            placement="top-start"
+            title="路径"
+            width="200"
+            trigger="hover"
+          >
+            <a
+              slot="reference"
+              :href="$baseUrl + '/file/' + scope.row.type + '/' + scope.row.realName"
+              class="el-link--primary"
+              style="word-break:keep-all;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color: #1890ff;font-size: 13px;"
+              target="_blank"
+            >
+              {{ scope.row.name }}
+            </a>
+          </el-popover>
+        </template>
      </el-table-column>
      <el-table-column
-        prop="contractType"
        header-align="center"
        align="center"
        label="合同类型">
+        <template slot-scope="scope">
+          {{ scope.row.contractType | dictLabel(dictsOpt['contract_type']) }}
+        </template>
      </el-table-column>
      <el-table-column
-        prop="isMaster"
        header-align="center"
        align="center"
        label="是否是主合同">
+        <template slot-scope="scope">
+          {{ ['否', '是'][scope.row.isMaster] }}
+        </template>
      </el-table-column>
      <el-table-column
        prop="contractNumber"
@@ -52,19 +74,18 @@
        prop="clientId"
        header-align="center"
        align="center"
-        label="客户id">
+        label="客户">
+        <template slot-scope="scope">
+          {{ scope.row.clientId | dictLabel(clientIdOpt) }}
+        </template>
      </el-table-column>
      <el-table-column
-        prop="materialJson"
-        header-align="center"
-        align="center"
-        label="物料信息">
-      </el-table-column>
-      <el-table-column
-        prop="isAcceptance"
        header-align="center"
        align="center"
        label="是否验收">
+        <template slot-scope="scope">
+          {{ ['否', '是'][scope.row.isAcceptance] }}
+        </template>
      </el-table-column>
      <el-table-column
        prop="createTime"
@@ -92,6 +113,8 @@
        label="操作">
        <template slot-scope="scope">
          <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.contractId)">修改</el-button>
+          <el-button type="text" size="small" @click="addTempHandle(scope.row.contractId)">模板</el-button>
+          <el-button type="text" size="small" @click="uploadHandle(scope.row.contractId)">上传</el-button>
          <el-button type="text" size="small" @click="deleteHandle(scope.row.contractId)">删除</el-button>
        </template>
      </el-table-column>
@@ -106,14 +129,17 @@
      layout="total, sizes, prev, pager, next, jumper">
    </el-pagination>
    <!-- 弹窗, 新增 / 修改 -->
-    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :clientIdOpt="clientIdOpt" :contractTypeOpt="dictsOpt['contract_type']" @refreshDataList="getDataList"></add-or-update>
    <temp-add-or-update v-if="tempVisible" ref="tempAdd"></temp-add-or-update>
+    <file-upload v-if="uploadVisible" ref="fileUpload"></file-upload>
  </div>
 </template>

 <script>
  import AddOrUpdate from './contract-add-or-update'
  import TempAddOrUpdate from './temp-add-or-update'
+  import FileUpload from './file-upload'
+  import { dictDetail } from '@/utils/dict'
  export default {
    data () {
      return {
@@ -127,17 +153,34 @@
        dataListLoading: false,
        dataListSelections: [],
        addOrUpdateVisible: false,
-        tempVisible: false
+        tempVisible: false,
+        uploadVisible: false,
+        clientIdOpt: []
      }
    },
+    mixins: [dictDetail(['contract_type'])],
    components: {
      AddOrUpdate,
-      TempAddOrUpdate
+      TempAddOrUpdate,
+      FileUpload
    },
    activated () {
+      this.getDictDetail()
      this.getDataList()
    },
    methods: {
+      getDictDetail () {
+        this.$http({
+          url: this.$http.adornUrl('/client/client/list?page=0&limit=9999'),
+          method: 'get'
+        }).then(({data}) => {
+          this.clientIdOpt = data.page.list
+          this.clientIdOpt.map(el => {
+            this.$set(el, 'value', el.clientId)
+            this.$set(el, 'label', el.clientName)
+          })
+        })
+      },
      // 获取数据列表
      getDataList () {
        this.dataListLoading = true
@@ -218,6 +261,13 @@
        this.$nextTick(() => {
          this.$refs.tempAdd.init(id)
        })
+      },
+      // 上传文件
+      uploadHandle (id) {
+        this.uploadVisible = true
+        this.$nextTick(() => {
+          this.$refs.fileUpload.init(id)
+        })
      }
    }
  }
--- a/base-vue/src/views/modules/contract/file-upload.vue
+++ b/base-vue/src/views/modules/contract/file-upload.vue
@@ -0,0 +1,80 @@
+<template>
+  <el-dialog
+    title="文件上传"
+    :close-on-click-modal="false"
+    :visible.sync="visible"
+    width="500px">
+    <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+      <el-form-item label="文件名" prop="name">
+        <el-input v-model="dataForm.name" placeholder="文件名"></el-input>
+      </el-form-item>
+      <el-form-item label="上传">
+        <el-upload
+          ref="upload"
+          :limit="1"
+          :before-upload="beforeUpload"
+          :auto-upload="false"
+          :headers="headers"
+          :on-success="handleSuccess"
+          :on-error="handleError"
+          :action="$baseUrl + '/api/localStorage' + '?name=' + dataForm.name"
+        >
+          <div class="eladmin-upload"><i class="el-icon-upload" />添加文件</div>
+          <div slot="tip" class="el-upload__tip">可上传任意格式文件，且不超过100M</div>
+        </el-upload>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">取消</el-button>
+      <el-button type="primary" @click="upload">确定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        visible: false,
+        dataForm: {
+          name: ''
+        },
+        headers: { 'Authorization': 'Bearer ' + this.$cookie.get('token') }
+      }
+    },
+    methods: {
+      init (id) {
+        this.visible = true
+        this.$nextTick(() => {
+          this.$refs['dataForm'].resetFields()
+        })
+      },
+      beforeUpload(file) {
+        let isLt2M = true
+        isLt2M = file.size / 1024 / 1024 < 100
+        if (!isLt2M) {
+          this.$message.error('上传文件大小不能超过 100MB!')
+        }
+        this.dataForm.name = file.name
+        return isLt2M
+      },
+      handleSuccess(response, file, fileList) {
+        this.$notify({title: '上传成功',type: 'success'})
+        this.$refs.upload.clearFiles()
+      },
+      handleError(e, file, fileList) {
+        const msg = JSON.parse(e.message)
+        this.$notify({
+          title: msg.message,
+          type: 'error',
+          duration: 2500
+        })
+      },
+      upload() {
+        this.$refs.upload.submit()
+        this.visible = false
+        this.$emit('refreshDataList')
+      }
+    }
+  }
+</script>