提交代码

src/views/NCcode/index.vue

@@ -727,10 +727,6 @@ function flchang(n:any) {
 function flremove(n:any) {
   let reg = new RegExp(`${n.file.id},?`)
   formData.fileId = formData.fileId.replace(reg,'')
-  
-  console.log(n,'flremove')
-  console.log(flist.value,'flist-r')
-  console.log(formData.fileId)
 }
 
 function addhand(type:any,row?:any) {
@@ -977,7 +973,7 @@ const selectedDeviceIds = ref<any>([])
 function handlerConnectionDevice(row:any) {
   deviceDocumentConnectionVisible.value = true
   title.value = row.ncName + "关联设备"
-  deviceDocumentConnection.sourceId = row.id
+  deviceDocumentConnection.sourceId = row.ncCode
   getDeviceList(deviceDocumentConnection.sourceId)
 }
 

src/views/biz/device/index.vue

@@ -377,7 +377,7 @@ const deviceDocumentConnection = ref<DeviceDocumentConnection>({})
 const connectionLoading = ref<boolean>(false)
 const connectionPagination = reactive({
   page: 1,
-  pageSize: 2,
+  pageSize: 10,
   itemCount: 0,
   showSizePicker: true,
   pageSizes: [10, 20, 50]
@@ -406,7 +406,7 @@ function rowKey(row:RowData){
   return row.id
 }
 
-const handleUpateCheck = async (keys:Array<string | number>,)=>{
+const handleUpateCheck = async (keys:Array<string | number>,row)=>{
   selectedDocumentIds.value = keys
   loadCreateApi()
 }
@@ -610,9 +610,9 @@ const documentColumns:DataTableColumns<Document> = [
   {title: '文档类型', key: 'type',width:80,
     render: (row) => {
         var opt = row.type;
-        if (opt == 1) return  "图纸"
+        if (opt == 0) return  "图纸"
-        if (opt == 2) return  "文件"
+        if (opt == 1) return  "文件"
-        if (opt == 3) return  "NC代码"
+        if (opt == 2) return  "NC代码"
         return "-"
     }
   },

src/views/lllustrated/index.vue

@@ -210,6 +210,7 @@
                   v-model:file-list="flist"
                   @finish="flchang"
                   accept=".pdf,.png,.jpg"
+                  @remove="flremove"
               >
 
                 <n-upload-dragger>
@@ -784,6 +785,7 @@ function addhand(type: any, row?: any) {
     //slehand('')
     formData.id = row.id
     formData.drawingCode = row.drawingCode
+    formData.drawingName = row.drawingName
     formData.processId = row.processId
     formData.drawingType = row.drawingType
     formData.fileId = row.fileId + ','
@@ -828,6 +830,7 @@ function addhand(type: any, row?: any) {
   } else {
     formData.id = ''
     formData.drawingCode = ''
+    formData.drawingName = ''
     formData.processId = ''
     formData.drawingType = 0
     formData.status = 1
@@ -986,6 +989,12 @@ function issuehand(row: any) {
 }
 
 
+function flremove(n:any) {
+  let reg = new RegExp(`${n.file.id},?`)
+  formData.fileId = formData.fileId.replace(reg,'')
+}
+
+
 function isssavehand() {
   if (issarr.length > 0) {
     drawingIssue({
@@ -1051,7 +1060,7 @@ const selectedDeviceIds = ref<Device[]>([])
 function handlerConnectionDevice(row:any) {
   deviceDocumentConnectionVisible.value = true
   title.value = row.drawingName + "关联设备"
-  deviceDocumentConnection.sourceId = row.id
+  deviceDocumentConnection.sourceId = row.drawingCode
   getDeviceList(deviceDocumentConnection.sourceId)
 }
 

src/views/production/componets/AssingWorkTreeTable.vue

@@ -231,7 +231,7 @@ const AssingWorkColumns :DataTableColumns<AssingWork> = [
   {
     title: '物料编码',
     key: 'materialCode',
-    width: 120,
+    width: 180,
     ellipsis: false,
     className: 'material-full-cell',
     render(row: any) {
@@ -241,7 +241,7 @@ const AssingWorkColumns :DataTableColumns<AssingWork> = [
   {
     title: '物料名称',
     key: 'materialName',
-    width: 120,
+    width: 180,
     ellipsis: false,
     className: 'material-full-cell',
     render(row: any) {