Browse Source

任务单列表:添加字段

chris 1 year ago
parent
commit
544615fb8a
2 changed files with 101 additions and 1 deletions
  1. 70 1
      src/views/modules/order/order-detail.vue
  2. 31 0
      src/views/modules/order/order.vue

+ 70 - 1
src/views/modules/order/order-detail.vue

@@ -126,6 +126,64 @@
               {{scope.row.rate}}%
             </template>
           </el-table-column>
+          <el-table-column
+            prop="mapNumber"
+            header-align="center"
+            align="center"
+            min-width="100"
+            :show-tooltip-when-overflow="true"
+            label="主图号">
+          </el-table-column>
+          <el-table-column
+            header-align="center"
+            align="center"
+            min-width="100"
+            :show-tooltip-when-overflow="true"
+            label="简图">
+            <template slot-scope="scope">
+              <div v-for="(item, index) in scope.row.attachList2" 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
+            prop="noticeChangeRecord"
+            header-align="center"
+            align="center"
+            min-width="120"
+            :show-tooltip-when-overflow="true"
+            label="产品变更记录">
+          </el-table-column>
+          <el-table-column
+            header-align="center"
+            align="center"
+            min-width="100"
+            :show-tooltip-when-overflow="true"
+            label="技术文件">
+            <template slot-scope="scope">
+              <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
+            header-align="center"
+            align="center"
+            label="对应图纸">
+            <template slot-scope="scope">
+              <el-button :disabled="!scope.row.drawingList || scope.row.drawingList.length === 0" type="text" size="small" @click="drawDetails(scope.row)">查看</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="techName"
+            header-align="center"
+            align="center"
+            min-width="100"
+            :show-tooltip-when-overflow="true"
+            label="工艺名称">
+          </el-table-column>
           <el-table-column
             prop="relatedProduct"
             header-align="center"
@@ -239,6 +297,7 @@
     </span>
     <!-- 文件预览 -->
     <preview-component v-if="previewVisible" ref="preview"/>
+    <product-draw-detail v-if="drawVisible" ref="drawDetail" @onChose="onChose"/>
   </div>
 </template>
 
@@ -250,9 +309,11 @@
   import uploadComponent from '../common/upload-component'
   import ApproveComponent from '../common/approve-component'
   import PreviewComponent from '@/views/modules/common/preview-component'
+  import ProductDrawDetail from '@/views/modules/tech/product-draw-detail'
 export default {
     name: 'order-detail',
     components: {
+      ProductDrawDetail,
       PreviewComponent,
       EDesc,
       EDescItem,
@@ -270,7 +331,8 @@ export default {
         workInfoDetails: [],
         activeNo: 0,
         stepList: [],
-        logList: []
+        logList: [],
+        drawVisible: false
       }
     },
     methods: {
@@ -329,6 +391,13 @@ export default {
         this.onChose()
         this.$emit('approveFinished')
       },
+      // 对应图纸
+      drawDetails (row) {
+        this.drawVisible = true
+        this.$nextTick(() => {
+          this.$refs.drawDetail.init(row.drawingList)
+        })
+      },
       // 预览
       previewFile (fileName, url) {
         this.previewVisible = true

+ 31 - 0
src/views/modules/order/order.vue

@@ -120,6 +120,37 @@
           min-width="160"
           label="任务单完成时间">
         </el-table-column>
+        <el-table-column
+          prop="productName"
+          header-align="center"
+          align="center"
+          min-width="160"
+          :show-tooltip-when-overflow="true"
+          label="物料名称">
+        </el-table-column>
+        <el-table-column
+          prop="mapNumber"
+          header-align="center"
+          align="center"
+          min-width="160"
+          :show-tooltip-when-overflow="true"
+          label="主图号">
+        </el-table-column>
+        <el-table-column
+          prop="cnt"
+          header-align="center"
+          align="center"
+          min-width="80"
+          label="单套数量">
+        </el-table-column>
+        <el-table-column
+          prop="productSpec"
+          header-align="center"
+          align="center"
+          min-width="160"
+          :show-tooltip-when-overflow="true"
+          label="物料规格">
+        </el-table-column>
         <el-table-column
           prop="notes"
           header-align="center"