修改

src/views/NCcode/index.vue

@@ -35,7 +35,7 @@
       </div>
 
       <n-space style="margin-bottom: 15px;">
-          <n-button type="primary" @click="addhand(1)" size="small">
+          <n-button v-if="hasPermission('biz:ncCode:add')" type="primary" @click="addhand(1)" size="small">
             <template #icon>
               <n-icon>
                 <AddOutline />
@@ -51,7 +51,7 @@
             </template>
             删除
           </n-button> -->
-          <n-button type="success" @click="issuehand" size="small">
+          <n-button v-if="hasPermission('biz:ncCode:export')"  type="success" @click="handleExport" size="small">
             <template #icon>
               <n-icon>
                 <ArrowDownCircleOutline />
@@ -111,7 +111,7 @@
       <n-grid :cols="1" :x-gap="24">
         <n-gi>
           <n-form-item path="ncCode" label="NC代码编号">
-            <n-input v-model:value="formData.ncCode" placeholder="请输入NC代码编号" />
+            <n-input v-model:value="formData.ncCode" placeholder="自动生成" disabled />
           </n-form-item>
         </n-gi>
         <n-gi>
@@ -214,51 +214,22 @@
       v-model:show="issueModel"
       title="下发"
       preset="card"
-      style="width: 500px"
+      style="width: 600px"
       :mask-closable="false"
     >
-    
+      <n-transfer
-    <n-form
+        v-model:value="value"
-      ref="issformRef"
+        style="height:500px;"
-      :model="issformData"
+        :options="options"
-      :rules="issaddrules"
+        :render-source-list="renderSourceList"
-      label-placement="top"
+        source-filterable
-      label-width="100"
+        @update:value="tranupdate"
-    >
-      <n-grid :cols="1" :x-gap="24">
-        <n-gi>
-          <n-form-item path="taskid" label="下发任务">
-            <n-select
-              :disabled="false"
-              :render-label="renderlabe"
-              v-model:value="issformData.taskid"
-              placeholder="请选择下发任务"
-              :options="isstasklist"
     />
-          </n-form-item>
-          <n-form-item path="equis" label="下发设备">
-            <n-select
-              :disabled="false"
-              :render-label="renderlabe"
-              v-model:value="issformData.equis"
-              placeholder="请选择下发设备"
-              :options="issequiplist"
-            />
-          </n-form-item>
-        </n-gi>
-        <!-- <n-gi>
-          <n-form-item path="ncName" label="下发代码">
-            <n-input v-model:value="formData.ncName" placeholder="请输入NC代码名称" />
-          </n-form-item>
-        </n-gi>       -->
-      </n-grid>
-    </n-form>
       <template #footer>
         <n-space justify="end">
           <n-button @click="issueModel = false">取消</n-button>
           <n-button 
             type="primary" 
-          
             @click="isssavehand"
           >确认</n-button>
         </n-space>
@@ -281,6 +252,7 @@ import {
 
 
 import { 
+  NTree,
   NButton, 
   NIcon, 
   NSpace, 
@@ -308,12 +280,12 @@ import {
   batchIssue,
   deleteIssue,
   editccode,
-  issuecopy
+  issuecopy,
+  generateNccode,
+  opertree,
+  exportNccode
 } from '@/api/nccode'
 
-
-
-
 const dialog = useDialog()
 
 const message = useMessage()
@@ -415,7 +387,7 @@ const columns = [
     key:"isIssued",
     minWidth:150,
     render(row:any) {
-      if(row.status == 1){
+      if(row.isIssued == 1){
         return '已下发'
       }
       return '未下发'
@@ -499,6 +471,9 @@ const columns = [
                   onPositiveClick: () => {
                     deleteIssue(row.id).then(() => {
                       message.success('操作成功')
+                      setTimeout(() => {
+                        search()
+                      },1000)
                     })
                     
                   },
@@ -623,9 +598,14 @@ function addhand(type:any,row?:any) {
   addModel.value = true
   formData.value?.restoreValidation()
   isstype.value = type
+  if(type == 1 || type == 3){
+    generateNccode().then(rps => {
+      formData.ncCode = rps  
+    })
+  }
+  
   if(row){
     formData.id = row.id	          
-    formData.ncCode = row.ncCode	          
     formData.ncName = row.ncName	          
     formData.ncContent = 	row.ncContent        
     formData.workCenter = row.workCenter	      
@@ -636,6 +616,11 @@ function addhand(type:any,row?:any) {
     // formData.issueTime = row.issueTime       
     // formData.issueBy = row.issueBy	        
     formData.remark = row.remark
+    if(type == 2){
+      formData.ncCode = row.ncCode
+    }else{
+      formData.ncCode = ''
+    }	        
   }else{
     formData.id = ''
     formData.ncCode = ''	          
@@ -669,7 +654,7 @@ function savehand() {
     if (!e) {
 
       addEdi().then(() => {
-        message.success(cztype[isstype.value])
+        message.success(`${cztype[isstype.value]}成功`)
         setTimeout(() => {
           getlist()
           addModel.value = false
@@ -705,38 +690,64 @@ function delhand() {
 }
 
 //下发任务列表
-let isstasklist = ref<any>([])
+//let isstasklist = ref<any>([])
 
 //下发设备列表
-let issequiplist = ref<any>([])
+//let issequiplist = ref<any>([])
 
-//下发
+let treeData:any = []
-let issueModel = ref(false)
+let value = ref<Array<string | number>>([])
-let issformData = reactive<any>({
+let renderSourceList:any = ''
-  taskid:'',
-  equis:''
-}) 
-const issaddrules = {
-  taskid:[
-    { required: true, message: '请选择下发任务', trigger: 'blur' }
-  ],
-  equis:[
-    { required: true, message: '请选择下发设备', trigger: 'blur' }
-  ]
 
+let options = ref<any>([])    //flattenTree(createData())
+
+function flattenTree(list: undefined | any[]) {
+  const result: any[] = []
+  function flatten(_list: any[] = []) {
+    _list.forEach((item) => {
+      result.push(item)
+      if(item.childList){
+        flatten(item.childList)
+      }
+      // else{
+      //   result.push(item)
+      // }
+    })
+  }
+  flatten(list)
+  return result
 }
 
 
+function tranupdate(v:any) {
+    console.log(v)
+}
+
+//下发
+let issueModel = ref(false)
+// let issformData = reactive<any>({
+//   taskid:'',
+//   equis:''
+// }) 
+// const issaddrules = {
+//   taskid:[
+//     { required: true, message: '请选择下发任务', trigger: 'blur' }
+//   ],
+//   equis:[
+//     { required: true, message: '请选择下发设备', trigger: 'blur' }
+//   ]
+  
+// }  
+
+
+
+
 function renderlabe() {}
+
 function issuehand() {
+  
   issueModel.value = true
-  // if(chearr.value.length > 0){
+
-  //   batchIssue(chearr.value).then(() => {
-  //     message.success('操作成功')
-  //   })
-  // }else{
-  //   message.error('请勾选设备')
-  // }
   
 }
 
@@ -753,11 +764,52 @@ function isssavehand() {
     }
   })
 }
+//导出
+let selectedIds = ref<any>([])
+function handleExport() {
+
+
+  exportNccode({}).then(rps => {
+     const url = window.URL.createObjectURL(rps)
+    const link = document.createElement('a')
+    link.href = url
+    link.download = 'NC代码数据.xlsx'
+    link.click()
+    window.URL.revokeObjectURL(url)
+  })
+}
+
 
 getlist()
 
 onMounted(() => {
  
+  //加载任务树
+  opertree().then(rps => {
+      treeData = rps
+      options.value = flattenTree(treeData)
+      console.log(rps,'112')
+      renderSourceList = function (obj:any) {
+          return h(NTree, {
+              style: 'margin: 0 4px;',
+              keyField: 'value',
+              checkable: true,
+              selectable: false,
+              blockLine: true,
+              checkOnClick: true,
+              childrenField:'childList',
+              data: treeData,
+              cascade:true,
+              defaultExpandAll:true,
+              pattern:obj.pattern,
+              checkedKeys: value.value,
+              onUpdateCheckedKeys: (checkedKeys: Array<string | number>) => {
+                  obj.onCheck(checkedKeys)
+              }
+          })
+      }
+  })
+
  //loadDictOptions()
 
 })