显示调整

package.json

@@ -17,6 +17,7 @@
     "axios": "^0.24.0",
     "babel-plugin-component": "0.10.1",
     "babel-polyfill": "6.26.0",
+    "core-js": "^3.12.1",
     "element-ui": "^2.13.1",
     "gulp": "3.9.1",
     "gulp-concat": "2.6.1",
@@ -24,27 +25,27 @@
     "gulp-replace": "0.6.1",
     "gulp-shell": "0.6.5",
     "html2canvas": "^1.3.2",
+    "jquery": "^3.5.1",
+    "js-file-download": "^0.4.12",
     "jspdf": "^2.4.0",
+    "jsplumb": "^2.15.5",
     "less-loader": "^5.0.0",
     "lodash": "^4.17.21",
     "node-sass": "4.12.0",
     "npm": "^6.9.0",
+    "panzoom": "^9.4.1",
     "svg-pathdata": "5.0.5",
     "svg-sprite-loader": "3.7.3",
+    "view-design": "^4.5.0-beta.3",
     "vue": "2.5.16",
+    "vue-click-outside": "^1.1.0",
+    "vue-contextmenujs": "^1.3.13",
     "vue-cookie": "1.1.4",
     "vue-notification": "^1.3.20",
     "vue-print-nb": "^1.7.5",
     "vue-router": "3.0.1",
     "vuedraggable": "^2.24.3",
-    "vuex": "3.0.1",
-    "core-js": "^3.12.1",
-    "jquery": "^3.5.1",
-    "jsplumb": "^2.15.5",
-    "panzoom": "^9.4.1",
-    "view-design": "^4.5.0-beta.3",
-    "vue-click-outside": "^1.1.0",
-    "vue-contextmenujs": "^1.3.13"
+    "vuex": "3.0.1"
   },
   "devDependencies": {
     "autoprefixer": "7.1.2",
@@ -80,6 +81,7 @@
     "jest": "21.2.0",
     "jest-serializer-vue": "0.3.0",
     "less": "^3.0.4",
+    "less-loader": "^5.0.0",
     "nightwatch": "0.9.12",
     "node-notifier": "5.1.2",
     "optimize-css-assets-webpack-plugin": "3.2.0",
@@ -101,8 +103,7 @@
     "webpack": "3.6.0",
     "webpack-bundle-analyzer": "2.9.0",
     "webpack-dev-server": "2.9.1",
-    "webpack-merge": "4.1.0",
-    "less-loader": "^5.0.0"
+    "webpack-merge": "4.1.0"
   },
   "engines": {
     "node": ">= 8.11.1",

src/api/file.js

@@ -10,3 +10,10 @@ export function uploadFiles (data) {
     data
   })
 }
+
+export function downloadFile (url) {
+  return request({
+    url: request.adornUrl(`/file-service/minio-file/download/${url}`),
+    method: 'get'
+  })
+}

src/views/modules/check/finish-check.vue

@@ -27,7 +27,7 @@
         prop="productName"
         header-align="center"
         align="center"
-        min-width="180"
+        min-width="160"
         :show-tooltip-when-overflow="true"
         label="产品名称">
       </el-table-column>
@@ -63,7 +63,7 @@
         label="是否合格">
       </el-table-column>
       <el-table-column
-        prop="recordsNote"
+        prop="operationRecords"
         header-align="center"
         align="center"
         width="180"
@@ -83,14 +83,6 @@
         min-width="160"
         label="检验时间">
       </el-table-column>
-<!--      <el-table-column-->
-<!--        prop="notes"-->
-<!--        header-align="center"-->
-<!--        align="center"-->
-<!--        width="160"-->
-<!--        :show-tooltip-when-overflow="true"-->
-<!--        label="备注">-->
-<!--      </el-table-column>-->
       <el-table-column
         fixed="right"
         header-align="center"

src/views/modules/check/product-check.vue

@@ -63,7 +63,7 @@
         label="是否合格">
       </el-table-column>
       <el-table-column
-        prop="recordsNote"
+        prop="operationRecords"
         header-align="center"
         align="center"
         width="160"

src/views/modules/common/preview-component.vue

@@ -9,8 +9,8 @@
 
 <script>
   import { downloadUrl } from '@/api/file'
-  import {getFileExt} from '@/api/util'
-  export default {
+  import { getFileExt } from '@/api/util'
+export default {
     name: 'preview-component',
     data () {
       return {

src/views/modules/cus/communicate.vue

@@ -71,7 +71,7 @@
         min-width="200"
         label="附件">
         <template slot-scope="scope">
-          <div v-for="(item, index) in scope.row.attachList">
+          <div v-for="(item, index) in scope.row.attachList" style="display: inline">
             <span v-if="index > 0">,</span>
             <a :key="item.fileName + index" type="primary" href="#" @click="previewFile(item.fileName, item.url)">{{ item.fileName }}</a>
           </div>

src/views/modules/msg-center/announcement-detail.vue

@@ -14,7 +14,7 @@
         </e-desc>
         <e-desc title="详细信息" column="2">
           <e-desc-item span="2" label="附件">
-            <div v-for="(item, index) in dataForm.attachList">
+            <div v-for="(item, index) in dataForm.attachList" style="display: inline">
               <span v-if="index > 0">,</span>
               <a :key="item.fileName + index" type="primary" href="#" @click="previewFile(item.fileName, item.url)">{{ item.fileName }}</a>
             </div>

src/views/modules/msg-center/announcement.vue

@@ -50,7 +50,7 @@
         min-width="200"
         label="附件">
         <template slot-scope="scope">
-          <div v-for="(item, index) in scope.row.attachList">
+          <div v-for="(item, index) in scope.row.attachList" style="display: inline">
             <span v-if="index > 0">,</span>
             <a :key="item.fileName + index" type="primary" href="#" @click="previewFile(item.fileName, item.url)">{{ item.fileName }}</a>
           </div>

src/views/modules/notice/notice.vue

@@ -59,7 +59,7 @@
         min-width="200"
         label="附件">
         <template slot-scope="scope">
-          <div v-for="(item, index) in scope.row.attaches">
+          <div v-for="(item, index) in scope.row.attaches" style="display: inline">
             <span v-if="index > 0">,</span>
             <a :key="item.fileName + index" type="primary" href="#" @click="previewFile(item.fileName, item.url)">{{ item.fileName }}</a>
           </div>

src/views/modules/order/dispatch.vue

@@ -67,7 +67,7 @@
         min-width="200"
         label="附件">
         <template slot-scope="scope">
-          <div v-for="(item, index) in scope.row.attachList">
+          <div v-for="(item, index) in scope.row.attachList" style="display: inline">
             <span v-if="index > 0">,</span>
             <a :key="item.fileName + index" type="primary" href="#" @click="previewFile(item.fileName, item.url)">{{ item.fileName }}</a>
           </div>

src/views/modules/production/equipment.vue

@@ -94,7 +94,7 @@
         min-width="200"
         label="使用说明书">
         <template slot-scope="scope">
-          <div v-for="(item, index) in scope.row.attachList">
+          <div v-for="(item, index) in scope.row.attachList" style="display: inline">
           <a :key="item.fileName + index" type="primary" :href="downloadUrl + item.url" target="_blank">{{ item.fileName }}</a>
             <span v-if="index > 0">,</span>
           </div>

src/views/modules/tech/product-draw-detail.vue

@@ -8,15 +8,9 @@
     >
       <div>
         <template v-for="(item, index) in dataList">
-<!--          <upload-component-->
-<!--            :display="true"-->
-<!--            :title="item.drawingName"-->
-<!--            :accept="'image/*'"-->
-<!--            :file-obj-list="item.attachList">-->
-<!--          </upload-component>-->
           <e-desc :title="item.drawingName" column="3" style="margin-bottom: 20px">
             <e-desc-item label="附件" span="2">
-              <div v-for="(item, index) in item.attachList">
+              <div v-for="(item, index) in item.attachList" style="display: inline">
                 <span v-if="index > 0">,</span>
                 <a :key="item.fileName + index" type="primary" href="#" @click="previewFile(item.fileName, item.url)">{{ item.fileName }}</a>
               </div>

src/views/modules/works/work.vue

@@ -24,7 +24,7 @@
         label="任务名称">
       </el-table-column>
       <el-table-column
-        v-if="showProgress"
+        v-if="Number(dataForm.state) !== 2"
         prop="completeNum"
         header-align="center"
         align="center"
@@ -71,20 +71,20 @@
         min-width="200"
         label="工序附件">
         <template slot-scope="scope">
-          <div v-for="(item, index) in scope.row.attachList">
+          <div v-for="(item, index) in scope.row.attachList" style="display: inline">
             <span v-if="index > 0">,</span>
             <a :key="item.fileName + index" type="primary" href="#" @click="previewFile(item.fileName, item.url)">{{ item.fileName }}</a>
           </div>
         </template>
       </el-table-column>
       <el-table-column
-        v-if="!showProgress"
+        v-if="Number(dataForm.state) === 3"
         prop="operationRecords"
         header-align="center"
         align="center"
         min-width="160"
         :show-tooltip-when-overflow="true"
-        label="操作说明">
+        label="完成记录说明">
       </el-table-column>
       <el-table-column
         v-if="dataForm.state !== '3'"
@@ -154,8 +154,8 @@
             <el-option label="报损" value="3"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="通过记录说明" prop="operationRecords" label-width="120px">
-          <el-input v-model="checkDialogForm.operationRecords" type="textarea" :rows="2" placeholder="请输入通过记录说明"></el-input>
+        <el-form-item label="完成记录说明" prop="operationRecords" label-width="120px">
+          <el-input v-model="checkDialogForm.operationRecords" type="textarea" :rows="2" placeholder="请输入"></el-input>
         </el-form-item>
         <el-form-item label="备注" prop="notes" label-width="120px">
           <el-input v-model="checkDialogForm.notes" type="textarea" :rows="2" placeholder="请输入备注"></el-input>
@@ -181,8 +181,8 @@
 
     <el-dialog title="完成任务" width="30%" :visible.sync="finishDialogFormVisible">
       <el-form :model="finishDialogForm" :rules="finishDialogFormRules" ref="finishDialogForm">
-        <el-form-item label="通过记录说明" prop="operationRecords" label-width="120px">
-          <el-input v-model="finishDialogForm.operationRecords" type="textarea" :rows="2" placeholder="请输入通过记录说明"></el-input>
+        <el-form-item label="完成记录说明" prop="operationRecords" label-width="120px">
+          <el-input v-model="finishDialogForm.operationRecords" type="textarea" :rows="2" placeholder="请输入"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -232,7 +232,7 @@ export default {
       finishDialogFormVisible: false,
       finishDialogForm: {},
       finishDialogFormRules: {
-        operationRecords: [{required: true, message: '通过记录说明不能为空', trigger: 'blur'}]
+        operationRecords: [{required: true, message: '完成记录说明不能为空', trigger: 'blur'}]
       },
       transferUserList: [],
       transferDialogFormRules: {
@@ -246,7 +246,7 @@ export default {
         notes: ''
       },
       checkDialogFormRules: {
-        operationRecords: [{required: true, message: '通过记录说明不能为空', trigger: 'blur'}],
+        operationRecords: [{required: true, message: '完成记录说明不能为空', trigger: 'blur'}],
         checkType: [{required: true, message: '请选择', trigger: 'blur'}]
       },
       damageDialogFormVisible: false,
@@ -265,7 +265,7 @@ export default {
       // 查询
     queryData () {
       this.pageIndex = 1
-      this.showProgress = this.dataForm.state !== '3'
+      this.showProgress = this.dataForm.state !== '2'
       this.getDataList()
     },
       // 获取数据列表

yarn.lock

@@ -6325,6 +6325,11 @@ js-calendar@^1.2.3:
   resolved "https://registry.nlark.com/js-calendar/download/js-calendar-1.2.3.tgz#a583b0644b4e695ba394f344d103dbcc7a7a7d3e"
   integrity sha1-pYOwZEtOaVujlPNE0QPbzHp6fT4=
 
+js-file-download@^0.4.12:
+  version "0.4.12"
+  resolved "https://registry.yarnpkg.com/js-file-download/-/js-file-download-0.4.12.tgz#10c70ef362559a5b23cdbdc3bd6f399c3d91d821"
+  integrity sha512-rML+NkoD08p5Dllpjo0ffy4jRHeY6Zsapvr/W86N7E0yuzAO6qa5X9+xog6zQNlH102J7IXljNY2FtS6Lj3ucg==
+
 "js-tokens@^3.0.0 || ^4.0.0":
   version "4.0.0"
   resolved "https://registry.nlark.com/js-tokens/download/js-tokens-4.0.0.tgz?cache=0&sync_timestamp=1619345098261&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-tokens%2Fdownload%2Fjs-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"