合同

src/views/modules/cus/contract-add-or-update.vue

@@ -1,91 +1,116 @@
 <template>
-  <el-dialog
-    title="发起评审"
-    width="70%"
-    :close-on-click-modal="false"
-    :visible.sync="visible">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="auto">
-      <el-row class="my-row">
-        <el-col :span="12">
-          <el-form-item label="沟通编码" prop="coCode">
-            <el-select
-              v-model="dataForm.coCode"
-              :disabled="isLook"
-              remote
-              placeholder="请选择">
-              <el-option
-                v-for="item in options1"
-                :key="item.value"
-                :label="item.coCode"
-                :value="item.coCode">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12" style="padding-left: 20px">
-          <el-form-item label="评审类别" prop="reType">
-            <el-select
-              v-model="dataForm.reType"
-              :disabled="isLook"
-              remote
-              placeholder="请选择">
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.code"
-                :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row class="my-row">
-        <el-col :span="12">
-          <el-form-item label="客户名称" prop="name">
-            <el-input v-model="dataForm.name" disabled placeholder="客户名称"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12" style="padding-left: 20px">
-          <el-form-item label="联系人" prop="cellName">
-            <el-input v-model="dataForm.cellName" disabled placeholder="联系人"></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row class="my-row">
-        <el-form-item label="备注说明">
-            <el-input v-model="dataForm.notes" :disabled="isLook" placeholder="备注说明"></el-input>
-          </el-form-item>
-      </el-row>
-      <el-row class="my-row">
-        <div class="title">沟通信息表附件</div>
-      </el-row>
-      <el-row class="my-row">
-        <div class="title"><span style="color: red">*</span> 合同评审表</div>
-        <el-upload
-          v-show="!isLook"
-          class="upload-demo"
-          ref="upload"
-          action="https://jsonplaceholder.typicode.com/posts/"
-          :on-preview="handlePreview"
-          :on-remove="handleRemove"
-          :file-list="fileList"
-          :auto-upload="false">
-          <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
-          <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">开始上传</el-button>
-        </el-upload>
-      </el-row>
-    </el-form>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="visible = false">取消</el-button>
-      <el-button v-if="!isLook" type="primary" @click="dataFormSubmit()">确定</el-button>
-    </span>
-  </el-dialog>
+  <div>
+    <el-dialog
+      title="发起评审"
+      width="70%"
+      :close-on-click-modal="false"
+      :visible.sync="visible">
+      <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="auto">
+        <el-row class="my-row">
+          <el-col :span="8">
+            <el-form-item label="评审编码" prop="reCode">
+              <el-input v-model="dataForm.reCode" :disabled="display || !id" placeholder="系统自动生成，无需填写"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" style="padding-left: 20px">
+            <el-form-item label="沟通编码" prop="coCode">
+              <el-select
+                v-model="dataForm.coCode"
+                :disabled="display"
+                remote
+                placeholder="请选择">
+                <el-option
+                  v-for="item in options1"
+                  :key="item.value"
+                  :label="item.coCode"
+                  :value="item.coCode">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" style="padding-left: 20px">
+            <el-form-item label="评审类别" prop="reType">
+              <el-select
+                v-model="dataForm.reType"
+                :disabled="display"
+                remote
+                placeholder="请选择">
+                <el-option
+                  v-for="item in options"
+                  :key="item.code"
+                  :label="item.value"
+                  :value="item.code">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row class="my-row">
+          <el-col :span="8">
+            <el-form-item label="客户名称" prop="name">
+              <el-input v-model="dataForm.name" disabled placeholder="客户名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" style="padding-left: 20px">
+            <el-form-item label="联系人" prop="cellName">
+              <el-input v-model="dataForm.cellName" disabled placeholder="联系人"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" style="padding-left: 20px">
+          </el-col>
+        </el-row>
+        <el-row class="my-row">
+          <el-form-item label="备注说明">
+              <el-input v-model="dataForm.notes" :disabled="display" placeholder="备注说明"></el-input>
+            </el-form-item>
+        </el-row>
+        <el-row class="my-row">
+          <div class="title">沟通信息表附件</div>
+        </el-row>
+        <el-row class="my-row">
+          <div class="title"><span style="color: red">*</span> 合同评审表</div>
+          <el-upload
+            class="upload-demo"
+            ref="upload"
+            :multiple="true"
+            action="#"
+            accept="image/jpeg,image/gif,image/png"
+            :on-preview="handlePreview"
+            :on-remove="handleRemove"
+            :on-change="handleChange"
+            :file-list="fileList"
+            :limit="5"
+            :on-exceed="handleExceed"
+            :auto-upload="false">
+            <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+            <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">开始上传</el-button>
+            <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，最多5张图片，且每张图片不超过10M</div>
+          </el-upload>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="visible = false">取消</el-button>
+        <el-button v-if="!display" type="primary" @click="dataFormSubmit()">确定</el-button>
+      </span>
+    </el-dialog>
+    <!-- 图片预览 -->
+    <el-dialog title="图片预览" :visible.sync="previewVisible" width="50%">
+      <img :src="previewPath" :alt="previewName" style="width:100%;height:100%" />
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-  import { getcoCode, getReviewType, getreDetail } from '@/api/cus'
+  import { getCoCode, getreDetail } from '@/api/cus'
+  import { getDictList } from '@/api/dict'
+  import { uploadUrl, downloadUrl, uploadFiles } from '@/api/file'
   export default {
     name: 'stock-order-inbound',
+    computed: {
+      orgId: {
+        get () { return this.$store.state.user.orgId }
+      }
+    },
     data () {
       return {
         visible: false,
@@ -109,29 +134,34 @@
           name: [{ required: true, message: '客户名称不能为空', trigger: 'blur' }],
           cellName: [{ required: true, message: '联系人不能为空', trigger: 'blur' }]
         },
-        isLook: false
+        display: false,
+        uploadUrl: uploadUrl,
+        previewPath: '',
+        previewName: '',
+        previewVisible: false
       }
     },
     watch: {
       'dataForm.coCode' (value) {
-        this.options1.forEach(v => {
-          if (v.customerId === value) {
-            this.dataForm.name = v.customerName
-            this.dataForm.cellName = v.contact
-          }
-        })
+        let v = this.options1.find((item) => { return item.coCode === value })
+        if (v) {
+          this.dataForm.name = v.customerName
+          this.dataForm.cellName = v.contact
+        }
       }
     },
     methods: {
-      async init (id, disabled) {
+      async init (id, disable) {
+        this.fileList = []
         this.visible = true
         this.id = id || 0
-        await getReviewType().then(({data}) => {
-          if (data && data.code === '200') {
-            this.options = data.data
+        // 获取评审类别
+        await getDictList({type: 'review_type'}).then(({data}) => {
+          if (data) {
+            this.options = data
           }
         })
-        await getcoCode().then(({data}) => {
+        await getCoCode().then(({data}) => {
           if (data && data.code === '200') {
             this.options1 = data.data
           }
@@ -144,13 +174,42 @@
         })
       },
       submitUpload () {
-        this.$refs.upload.submit()
+        // this.$refs.upload.submit()
+        if (this.fileList.length === 0) {
+          return this.$message.warning('请选取文件后再上传')
+        }
+        const formData = new FormData()
+        this.fileList.forEach((file) => {
+          formData.append('file', file.raw)
+        })
+        uploadFiles(formData).then(({data}) => {
+          if (data && data.code === '200') {
+            data.data.forEach((item) => {
+              let fileData = this.fileList.find((file) => file.name === item.originFileName)
+              fileData.url = item.fileUrl
+            })
+            this.$message.success('上传成功')
+          } else {
+            this.$message.error('上传失败')
+          }
+        })
       },
       handleRemove (file, fileList) {
-        console.log(file, fileList)
+        this.fileList = fileList
       },
       handlePreview (file) {
-        console.log(file)
+        if (file && file.url) {
+          // 获取文件路径
+          this.previewPath = downloadUrl + file.url
+          this.previewName = file.name
+          this.previewVisible = true
+        }
+      },
+      handleChange (file, fileList) {
+        this.fileList = fileList
+      },
+      handleExceed (files, fileList) {
+        this.$message.warning(`当前限制选择 5 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`)
       },
       // 表单提交
       dataFormSubmit () {
@@ -159,7 +218,7 @@
             this.$http({
               url: this.$http.adornUrl(`/biz-service/flow/cusContractReview/submit`),
               method: 'post',
-              data: this.$http.adornData(this.dataForm)
+              data: this.$http.adornData({...this.dataForm, orgId: this.orgId})
             }).then(({data}) => {
               if (data && data.code === '200') {
                 this.$message({

src/views/modules/cus/contract.vue

@@ -2,7 +2,7 @@
   <div class="stock">
     <el-form :inline="true" :model="dataForm" @keyup.enter.native="search()">
       <el-form-item label="名称">
-        <el-input v-model="dataForm.cusName" placeholder="客户名称" clearable/>
+        <el-input v-model="dataForm.customerName" placeholder="客户名称" clearable/>
       </el-form-item>
       <el-form-item>
         <el-button @click="search()">查询</el-button>
@@ -21,25 +21,25 @@
         align="center">
       </el-table-column>
       <el-table-column
-        prop="reCode"
+        prop="-"
         header-align="center"
         align="center"
         label="评审编码">
       </el-table-column>
       <el-table-column
-        prop="coCode"
+        prop="-"
         header-align="center"
         align="center"
         label="沟通编码">
       </el-table-column>
       <el-table-column
-        prop="cusName"
+        prop="customerName"
         header-align="center"
         align="center"
         label="客户名称">
       </el-table-column>
       <el-table-column
-        prop="approverList"
+        prop="contact"
         header-align="center"
         align="center"
         label="联系人">
@@ -51,7 +51,7 @@
         label="对接业务员">
       </el-table-column>
       <el-table-column
-        prop="reType"
+        prop="-"
         header-align="center"
         align="center"
         label="类别">
@@ -110,9 +110,7 @@
     data () {
       return {
         addOrUpdateVisible: false,
-        dataForm: {
-          cusName: ''
-        },
+        dataForm: {},
         options: [],
         dataList: [],
         pageIndex: 1,
@@ -141,7 +139,7 @@
           params: this.$http.adornParams({
             'current': this.pageIndex,
             'size': this.pageSize,
-            'cusName': this.dataForm.cusName
+            'customerName': this.dataForm.customerName ? this.dataForm.customerName : null
           })
         }).then(({data}) => {
           if (data && data.code === '200') {

src/views/modules/notice/notice-add-or-update.vue

@@ -72,7 +72,7 @@
 </template>
 
 <script>
-  import { getcoCode, getReviewType, getreDetail } from '@/api/cus'
+  // import { getcoCode, getReviewType, getreDetail } from '@/api/cus'
   export default {
     name: 'notice-add-or-update',
     data () {
@@ -115,22 +115,6 @@
       async init (id, disabled) {
         this.visible = true
         this.id = id || 0
-        await getReviewType().then(({data}) => {
-          if (data && data.code === '200') {
-            this.options = data.data
-          }
-        })
-        await getcoCode().then(({data}) => {
-          if (data && data.code === '200') {
-            this.options1 = data.data
-          }
-        })
-        if (!id) return
-        await getreDetail().then(({data}) => {
-          if (data && data.code === '200') {
-            this.dataForm = data.data
-          }
-        })
       },
       submitUpload () {
         this.$refs.upload.submit()