数控物料管理详情

src/views/modules/common/upload-component-v2.vue

@@ -94,10 +94,14 @@ export default {
       this.$emit('uploadSuccess', newVal)
     },
     fileObjList (newVal) {
+      if (newVal && newVal instanceof Array) {
+        newVal.forEach(t => { t.name = t.fileName })
+      }
       this.fileList = newVal
     },
     value (newVal) {
-      if (newVal) {
+      if (newVal && newVal instanceof Array) {
+        newVal.forEach(t => { t.name = t.fileName })
         this.fileList = this.uploadFileList = newVal
       }
     }

src/views/modules/tech/program-detail.vue

@@ -3,18 +3,43 @@
     <div class="my-title">查看</div>
     <div>
       <e-desc title="基本信息" column="3">
-        <e-desc-item label="方案编码">{{ dataForm.taskCode }}</e-desc-item>
-        <e-desc-item label="物料名称">{{}} </e-desc-item>
-        <e-desc-item label="程序编号">{{}} </e-desc-item>
+        <e-desc-item label="方案编码">{{ dataForm.programId }}</e-desc-item>
+        <e-desc-item label="物料名称">{{ dataForm.productName }} </e-desc-item>
+        <e-desc-item label="程序编号">{{dataForm.programCode }} </e-desc-item>
 
-        <e-desc-item label="程序说明">{{ dataForm.taskName }}</e-desc-item>
+        <e-desc-item label="程序说明" span="3">{{ dataForm.programInstructions }}</e-desc-item>
+        <e-desc-item label="备注" span="3">{{ dataForm.remark }}</e-desc-item>
       </e-desc>
-      <e-desc title="附件">
+      <e-desc title="程序包">
         <upload-component
           :display="true"
           :display-title="false"
           :accept="'*'"
-          :file-obj-list="dataForm.fileList"
+          :value="dataForm.cxbList"
+        />
+      </e-desc>
+      <e-desc title="防真验证情况记录表">
+        <upload-component
+          :display="true"
+          :display-title="false"
+          :accept="'*'"
+          :value="dataForm.fzyzList"
+        />
+      </e-desc>
+      <e-desc title="数控加工程序试切鉴定表">
+        <upload-component
+          :display="true"
+          :display-title="false"
+          :accept="'*'"
+          :value="dataForm.cxsqList"
+        />
+      </e-desc>
+      <e-desc title="数控加工程序单">
+        <upload-component
+          :display="true"
+          :display-title="false"
+          :accept="'*'"
+          :value="dataForm.skjgList"
         />
       </e-desc>
     </div>
@@ -27,7 +52,7 @@
 <script>
 import EDesc from '../common/e-desc'
 import EDescItem from '../common/e-desc-item'
-import uploadComponent from '../common/upload-component'
+import uploadComponent from '../common/upload-component-v2'
 import {getDetail} from '@/api/program'
 export default {
   name: 'tech-program-detail',
@@ -35,7 +60,10 @@ export default {
   data () {
     return {
       id: '',
-      dataForm: {}
+      dataForm: {
+        cxbList: [],
+        cxsqList: []
+      }
     }
   },
   methods: {