fix:代办界面

imcs-ui/src/api/machiningClient/stationMgr.js

@@ -50,10 +50,18 @@ const apiList = {
         method: 'POST',
 	    url: `/authority/stationUser/addCutToolTask`
 	},
+	addCutToolTaskMore:{
+        method: 'POST',
+	    url: `/authority/stationUser/addCutToolTaskMore`
+	},
 	setWriteTakeCutter:{
         method: 'POST',
 	    url: `/authority/stationUser/setWriteTakeCutter`
 	},
+	setWriteTakeCutterMore:{
+        method: 'POST',
+	    url: `/authority/stationUser/setWriteTakeCutterMore`
+	},
   	remove: {
     	method: 'DELETE',
     	url: `/authority/stationUser`
@@ -140,12 +148,24 @@ export default {
 	      	data
 	    })
   	},
+	addCutToolTaskMore (data) {
+	    return axiosApi({
+	      	...apiList.addCutToolTaskMore,
+	      	data
+	    })
+  	},
 	setWriteTakeCutter (data) {
 	    return axiosApi({
 	      	...apiList.setWriteTakeCutter,
 	      	data
 	    })
   	},
+	setWriteTakeCutterMore (data) {
+	    return axiosApi({
+	      	...apiList.setWriteTakeCutterMore,
+	      	data
+	    })
+  	},
   	remove (data) {
 	    return axiosApi({
 	      	...apiList.remove,

imcs-ui/src/api/runManageCenter/mesNotice.js

@@ -57,6 +57,10 @@ const apiList = {
   download: {
     method: 'GET',
     url: `/authority/mesNotice/download`
+  },
+  modify: {
+    method: 'POST',
+    url: `/authority/mesNotice/notice/modify`
   }
 }
 
@@ -158,5 +162,11 @@ export default {
       ...apiList.download,
       data
     })
+  },
+  modify (data) {
+    return axiosApi({
+      ...apiList.modify,
+      data
+    })
   }
 }

imcs-ui/src/lang/zh/zh.js

@@ -590,8 +590,10 @@ export default {
     	addAudioTips: '提交审核成功！',
     	audio: '审核',
     	daiAudio: '待审核',
+      notSubmitted: '未提交',
     	audioOk: '审核通过',
-    	aduioFail: '审核不通过'
+    	aduioFail: '审核不通过',
+    	locationManagement: '位置管理',
     },
     adopt: {
     	adopt: '通过',

imcs-ui/src/views/zuihou/centralToolMagazine/cutterCategoriesGroup/tab/partNeedGroupCutter/components/Edit.vue

@@ -113,6 +113,7 @@ export default {
 		  CutToolShelfList: [],
       isjc: true,
       cutGoalNoIsShow: false,
+      isMoreShow: false,
       dialog: {
         isVisible: false,
         title: ""
@@ -146,7 +147,8 @@ export default {
       }, {
         doc: 'FDJ',
         label: '放刀库'
-      }]
+      }],
+      
     }
   },
   // 实例已经在内存中创建好，此时data和methods已将ok,如果要操作data中的数据或是调用methods中的方法，最早只能在created中操作
@@ -265,6 +267,34 @@ export default {
       // 字典表
       this.dicts = dicts
     },
+    setTenantMore (vals, dicts) {
+      let val = vals[0]
+      console.log("弹框写入val"+ val +"dicts:"+ dicts);
+    	if(val){
+    		this.customizeCuttingTool = { ...val }
+        this.$set(this.customizeCuttingTool, 'cutGoalNo', null);
+        this.$set(this.customizeCuttingTool, 'doc', null);
+        if(val.dkPointId!=null  ){
+          this.isjc = false
+          this.$set(this.customizeCuttingTool, 'start', val.dkPointId);
+          this.$set(this.customizeCuttingTool, 'thisDeviceCode', val.dkDeviceCode);
+          this.$set(this.customizeCuttingTool, 'thisDeviceName', val.dkDeviceName);
+          this.$set(this.customizeCuttingTool, 'thisPositionName', val.dkStorgeName);
+        }else if (val.jcPointId) {
+          this.isjc = true
+          this.customizeCuttingTool.start = val.jcPointId;
+          this.$set(this.customizeCuttingTool, 'thisDeviceCode', val.jcDeviceCode);
+          this.$set(this.customizeCuttingTool, 'thisDeviceName', val.jcDeviceName);
+          this.$set(this.customizeCuttingTool, 'thisPositionName', val.jcPointName);
+        }else {
+          this.isjc = false
+          this.customizeCuttingTool.start = ''
+          this.$set(this.customizeCuttingTool, 'thisPositionName', '线外');
+        }
+    	}
+      // 字典表
+      this.dicts = dicts
+    },
     close () {
       this.$emit('close')
     },

imcs-ui/src/views/zuihou/centralToolMagazine/cutterCategoriesGroup/tab/partNeedGroupCutter/components/EditMore.vue

@@ -0,0 +1,632 @@
+<template>
+  <el-dialog
+  	:close-on-click-modal="false"
+  	:close-on-press-escape="false"
+  	:title="title"
+  	:append-to-body="true"
+  	:visible.sync="isVisible"
+  	width="750px"
+  	top="50px"
+  >
+    <el-form ref="form" :disabled="formDisabled" :model="customizeCuttingTool" :rules="rules" label-position="right" label-width="100px">
+      <!-- 刀具编号 -->
+      <!-- <el-form-item :label='$t("cuttingTool.form.customizeCuttingtool.cuttingToolNo")+"："' prop="cutterT">
+        <el-input v-model="customizeCuttingTool.cutterT" :disabled="true" style="width: 93%;" ></el-input>
+      </el-form-item>       -->
+      <!-- 刀具名称-->
+      <!-- <el-form-item :label='$t("cuttingTool.form.customizeCuttingtool.cuttingToolName")+"："' prop="cutterName">
+        <el-input v-model.trim="customizeCuttingTool.cutterName"  :label='$t("common.pleaseEnter")' maxlength="128" style="width: 93%;" :disabled="true"></el-input>
+      </el-form-item> -->
+      <!-- 当前设备 -->
+      <el-form-item :label='$t("cuttingTool.form.customizeCuttingtool.thisDeviceName")+"："' prop="thisDeviceName">
+        <el-input v-model.trim="customizeCuttingTool.thisDeviceName"  :label='$t("common.pleaseEnter")' maxlength="128" style="width: 93%;" :disabled="true"></el-input>
+      </el-form-item>
+      <!-- 当前位置 -->
+      <!-- <el-form-item :label='$t("cuttingTool.form.customizeCuttingtool.thisPositionName")+"："' prop="thisPositionName">
+        <el-input v-model.trim="customizeCuttingTool.thisPositionName"  :label='$t("common.pleaseEnter")' maxlength="128" style="width: 93%;" :disabled="true"></el-input>
+      </el-form-item> -->
+      <!-- 起始位置在机床 -->
+      <el-form-item v-if ="this.isjc"  label="目的位置:" prop="doc">
+          <el-select v-model="customizeCuttingTool.doc" style="width: 93%;">								
+            <el-option v-for="dosData in docDataList"  :key="dosData.doc" :label="dosData.label" :value="dosData.doc"
+            ></el-option>		
+          </el-select>
+      </el-form-item>
+      <!-- 起始位置不在机床 -->
+      <el-form-item v-if ="!this.isjc" :label='$t("cuttingTool.form.customizeCuttingtool.targetPosition")+"："' prop="targetPosition">
+      	<el-select v-model="customizeCuttingTool.targetPosition" :placeholder='$t("common.pleaseSelect")' @change="choose" style="width: 93%;">
+					<el-option 
+           v-for="item in cutToolDeviceList"
+            :label="item.name" 
+            :value="item.code"
+             :key="item.code" >
+            </el-option>		
+      	</el-select>
+      </el-form-item>
+      <!-- <el-form-item v-if ="!this.isjc" label="目的位:" prop="targetPointId">
+          <el-select v-model="customizeCuttingTool.targetPointId" style="width: 93%;">								
+            <el-option v-for="position in cutToolStorgeList" :label="position.name" :value="position.pointId" :key="position.pointId"></el-option>		
+          </el-select>
+      </el-form-item>
+      <el-form-item v-if ="this.cutGoalNoIsShow && !this.isjc"  label="目的刀位号:" prop="cutGoalNo">
+          <el-select v-model="customizeCuttingTool.cutGoalNo" style="width: 93%;">								
+            <el-option v-for="cuttoolshelf in CutToolShelfList" :label="cuttoolshelf" :value="cuttoolshelf" :key="cuttoolshelf"></el-option>		
+          </el-select>
+      </el-form-item> -->
+
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button plain type="warning" @click="isVisible = false">{{ $t('common.cancel') }}</el-button>
+      <el-button plain type="primary" :disabled="confirmDisabled" @click="submitForm">{{ $t('common.confirm') }}</el-button>
+    </div>
+
+  </el-dialog>
+</template>
+<script>
+	// 【刀具管理】-API
+	import classScheduleMgrApi from "@/api/modelingCenter/cutterCategoriesGroup"
+	import equipmentMgrApi from "@/api/resourceProductMgr/equipmentMgr"	
+	import toolbarApi from "@/api/systemMgr/toolbar"
+  import stationMgrApi from "@/api/machiningClient/stationMgr"
+  import db from "@/utils/localstorage";
+  import {Base64} from 'js-base64';
+	import qs from 'qs'
+  import {initQueryParams } from '@/utils/commons'
+export default {
+  name: 'CustomizeCuttingToolEdit',
+  components: {},
+  props: {
+    dialogVisible: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      default: ''
+    }
+  },
+  data () {
+    return {
+      type: 'add',
+      // 附件上传
+      action: `${process.env.VUE_APP_BASE_API}/file/attachment/upload`,
+      // 附件其它参数
+      cuttingToolPictureData: {
+          bizId: "",
+          bizType: "cuttingToolPictureData"
+      },
+      cuttingToolInstallPictureData: {
+          bizId: "",
+          bizType: "cuttingToolInstallPictureData"
+      },
+      // 附件的值
+      cuttingToolPictureFileList: [],
+      cuttingToolInstallPictureFileList: [],
+      customizeCuttingTool: this.initCustomizeCuttingTool(),
+      customizeCuttingToolMore: this.initCustomizeCuttingTool(),
+      queryMachineParams: initQueryParams({}),
+      screenWidth: 0,
+      width: this.initWidth(),
+      confirmDisabled: false,
+      deviceData: [],
+      cutToolDeviceList:[],
+      cutToolStorgeList: [{"name":"请选择","pointId":""}],
+		  CutToolShelfList: [],
+      isjc: true,
+      cutGoalNoIsShow: false,
+      isMoreShow: false,
+      dialog: {
+        isVisible: false,
+        title: ""
+      },
+      dicts:{
+        CUTTING_TOOL_TYPE: {},
+        CUTTING_TOOL_CATEGORY: {},
+      },
+      dssd:{
+        CUTTING_TOOL_TYPE: {},
+        CUTTING_TOOL_CATEGORY: {},
+      },
+      roles: [],
+      rules: {
+        targetPosition: [
+        	{ required: true, message: this.$t("rules.require"), trigger: 'change' },
+        ],
+        // targetPointId: [
+        // 	{ required: true, message: this.$t("rules.require"), trigger: 'change' },
+        // ],
+        // cutGoalNo: [
+        // 	{ required: true, message: this.$t("rules.require"), trigger: 'change' },
+        // ],
+        doc: [
+        	{ required: true, message: this.$t("rules.require"), trigger: 'change' },
+        ]
+      },
+      docDataList: [{
+        doc: 'HD',
+        label: '出库'
+      }, {
+        doc: 'FDJ',
+        label: '放刀库'
+      }],
+      
+    }
+  },
+  // 实例已经在内存中创建好，此时data和methods已将ok,如果要操作data中的数据或是调用methods中的方法，最早只能在created中操作
+  created() {
+    console.log("edit")
+    this.findDeviceList();
+  },
+  computed: {
+    headers() {
+      return {
+        token: 'Bearer ' + db.get("TOKEN", ""),
+        tenant: db.get("TENANT", "") || "",
+        Authorization: `Basic ${Base64.encode(`${process.env.VUE_APP_CLIENT_ID}:${process.env.VUE_APP_CLIENT_SECRET}`)}`
+      };
+    },
+  	formDisabled(){
+      this.confirmDisabled = false
+      return false
+  	},
+    isVisible: {
+      get () {
+        return this.dialogVisible
+      },
+      set () {
+        this.close()
+        this.reset()
+      }
+    }
+  },
+  mounted () {
+    window.onresize = () => {
+      return (() => {
+        this.width = this.initWidth()
+      })()
+    }
+  },
+  methods: {
+	  findDeviceList () {
+      equipmentMgrApi.getList({})
+        .then((response) => {
+          const res = response.data;
+          if (res.isSuccess) {
+            // 赋值            
+            this.cutToolDeviceList = res.data.filter(item=> {				
+              return item.modeSpecification!=null || item.name.indexOf("刀具") > -1
+            });	
+            }         
+          })
+          .finally();	     
+	    },
+  	// 【新增-修改】弹出框，关闭
+  	editClose () {
+      this.dialog.isVisible = false
+    },
+    add () {
+      this.$refs.edit.type = "add"
+      this.dialog.title = this.$t("prepare.common.selectEq")
+      this.dialog.isVisible = true
+    },
+    initCustomizeCuttingTool () {
+      return {
+        id: '',
+        specifications: '',
+        cuttingToolNo: 1,  
+        cuttingToolName: '',
+        cuttingToolType: {
+            key: ""
+        },
+        cuttingToolCategory: {
+            key: ""
+        },
+        deviceId: '',
+        resourceIdList: [],
+        cutterNo: 0,
+        cuttingToolPicture: '',
+        cuttingToolInstallPicture: '',
+        remark: '',
+        status: '1',
+        cutterCode: '',
+      }
+    },
+    initWidth () {
+      this.screenWidth = document.body.clientWidth
+      if (this.screenWidth < 991) {
+        return '90%'
+      } else if (this.screenWidth < 1400) {
+        return '45%'
+      } else {
+        return '800px'
+      }
+    },
+    setTenant (val, dicts) {
+      console.log("弹框写入val"+ val +"dicts:"+ dicts);
+    	if(val){
+    		this.customizeCuttingTool = { ...val }
+        this.$set(this.customizeCuttingTool, 'cutGoalNo', null);
+        this.$set(this.customizeCuttingTool, 'doc', null);
+        if(val.dkPointId!=null  ){
+          this.isjc = false
+          this.$set(this.customizeCuttingTool, 'start', val.dkPointId);
+          this.$set(this.customizeCuttingTool, 'thisDeviceCode', val.dkDeviceCode);
+          this.$set(this.customizeCuttingTool, 'thisDeviceName', val.dkDeviceName);
+          this.$set(this.customizeCuttingTool, 'thisPositionName', val.dkStorgeName);
+        }else if (val.jcPointId) {
+          this.isjc = true
+          this.$set(this.customizeCuttingTool, 'start', val.jcPointId);
+          this.$set(this.customizeCuttingTool, 'thisDeviceCode', val.jcDeviceCode);
+          this.$set(this.customizeCuttingTool, 'thisDeviceName', val.jcDeviceName);
+          this.$set(this.customizeCuttingTool, 'thisPositionName', val.jcPointName);
+        }else {
+          this.isjc = false
+          this.$set(this.customizeCuttingTool, 'start', null);
+          this.$set(this.customizeCuttingTool, 'thisPositionName', '线外');
+        }
+    	}
+      // 字典表
+      this.dicts = dicts
+    },
+    setTenantMore (vals, dicts) {
+      this.customizeCuttingToolMore = vals
+      let val = vals[0]
+      console.log("弹框写入val"+ val +"dicts:"+ dicts);
+    	if(val){
+    		this.customizeCuttingTool = { ...val }
+        this.$set(this.customizeCuttingTool, 'cutGoalNo', null);
+        this.$set(this.customizeCuttingTool, 'doc', null);
+        if(val.dkPointId!=null  ){
+          this.isjc = false
+          this.$set(this.customizeCuttingTool, 'start', val.dkPointId);
+          this.$set(this.customizeCuttingTool, 'thisDeviceCode', val.dkDeviceCode);
+          this.$set(this.customizeCuttingTool, 'thisDeviceName', val.dkDeviceName);
+          this.$set(this.customizeCuttingTool, 'thisPositionName', val.dkStorgeName);
+        }else if (val.jcPointId) {
+          this.isjc = true
+          this.$set(this.customizeCuttingTool, 'start', val.jcPointId);
+          this.$set(this.customizeCuttingTool, 'thisDeviceCode', val.jcDeviceCode);
+          this.$set(this.customizeCuttingTool, 'thisDeviceName', val.jcDeviceName);
+          this.$set(this.customizeCuttingTool, 'thisPositionName', val.jcPointName);
+        }else {
+          this.isjc = false
+          this.$set(this.customizeCuttingTool, 'start', null);
+          this.$set(this.customizeCuttingTool, 'thisPositionName', '线外');
+        }
+    	}
+      // 字典表
+      this.dicts = dicts
+    },
+    close () {
+      this.$emit('close')
+    },
+    reset () {
+      // 先清除校验，再清除表单，不然有奇怪的bug
+      this.$refs.form.clearValidate()
+      this.$refs.form.resetFields()
+      this.customizeCuttingTool = this.initCustomizeCuttingTool()
+      // 清空上传附件
+      this.cuttingToolPictureFileList = []
+      this.cuttingToolInstallPictureFileList = []
+    },
+    submitForm () {
+      console.log("提交")
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+
+            // 判断多条数据是否满足任务创建条件
+            if(this.cutGoalNoIsShow){
+              if(this.CutToolShelfList.length < this.customizeCuttingToolMore.length){
+                  this.$message({
+                        message: "目的点位空位置不够存放",
+                        type: 'warning'
+                  })
+                  return
+              }
+            }else {
+              if(this.cutToolStorgeList.length < this.customizeCuttingToolMore.length){
+                  this.$message({
+                        message: "目的点位空位置不够存放",
+                        type: 'warning'
+                  })
+                  return
+              }
+            }
+          
+          this.confirmDisabled = true
+          if(this.isjc){
+            this.updateJc()
+          }else {
+            this.update()
+          }
+
+        } else {
+          return false
+        }
+      })
+    },
+    save () {
+  	    console.log(this.customizeCuttingTool)
+      classScheduleMgrApi.partNeedCuttersave(this.customizeCuttingTool)
+        .then((response) => {
+          const res = response.data
+          if (res.isSuccess) {
+            this.isVisible = false
+            this.$message({
+              message: this.$t('tips.createSuccess'),
+              type: 'success'
+            })
+            // 通知列表
+	          this.$emit("success");
+	          // 通知列表-并关闭弹出框
+	          this.$emit("close");
+          }
+        }).finally(() => {
+          this.confirmDisabled = false
+          return true
+        })
+    },
+    updateJc () {
+      if(this.customizeCuttingTool.cutterNo>0 || this.customizeCuttingTool.storgeName !==null){
+        this.customizeCuttingToolMore.map(item =>{
+          item.doc = this.customizeCuttingTool.doc
+        })
+          stationMgrApi.setWriteTakeCutterMore(this.customizeCuttingToolMore).then((res) => {
+                res = res.data;
+                if (res.isSuccess) {
+                    this.loading = false		  
+                    this.$message({
+                        message: res.data,
+                        type: 'success'
+                      })
+                    //通知列表-并关闭弹出框
+                    this.$emit("close");
+                }
+              }).catch((e)=>{
+                console.log("错误"+ e)
+            }).finally(()=>{
+              this.confirmDisabled = false
+              this.loading = false	
+          });
+            
+      }else {
+        this.confirmDisabled = false
+        this.loading = false	
+        this.$message({
+            message: "起点为线外，请通过上下料站执行",
+            type: 'warning'
+          })
+      }
+    },
+    update () {
+      // 判断是否为线外，线外通过上下料站就可以了
+      if(this.customizeCuttingTool.cutterNo>0 || this.customizeCuttingTool.storgeName !==null){
+        this.customizeCuttingToolMore.map(item =>{
+            item.goalType = this.customizeCuttingTool.targetPosition,
+            item.start =  item.dkPointId
+        })
+
+          stationMgrApi.addCutToolTaskMore(this.customizeCuttingToolMore).then((res) => {
+                res = res.data;
+                if (res.isSuccess) {
+                    this.loading = false
+                    this.$message({
+                      message: "成功",
+                      type: 'success'
+                    })		  
+                    this.$emit("success");
+                    //通知列表-并关闭弹出框
+                    this.$emit("close");
+                }
+              }).catch((e)=>{
+              console.log("错误"+ e)
+            }).finally(()=>{
+              this.confirmDisabled = false
+              this.loading = false	
+          });
+      }else {
+        this.confirmDisabled = false
+        this.$message({
+            message: "起点为线外，请通过上下料站执行",
+            type: 'warning'
+          })
+      }
+
+    },
+    // 文件列表移除文件时的钩子
+    handleCuttingToolPictureRemove(file, fileList) {
+        console.log("删除事件：", file, fileList);
+        // 还原数据
+        this.resetCuttingToolPictureFile()
+    },
+    // 点击文件列表中已上传的文件时的钩子
+    handleCuttingToolPicturePreview(file) {
+        console.log("上传之前事件：",file);
+    },
+    // 文件超出个数限制时的钩子
+    handleCuttingToolPictureExceed(files, fileList) {
+        this.$message.warning(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+    },
+    // 删除文件之前的钩子，参数为上传的文件和文件列表，若返回 false 或者返回 Promise 且被 reject，则停止删除。
+    beforeCuttingToolPictureRemove(file, fileList) {
+        return this.$confirm(`确定移除 ${ file.name }？`);
+    },
+    // 文件上传成功时的钩子
+    handleCuttingToolPictureSuccess(response, file, fileList){
+        console.log("文件上传成功!", response)
+        if(response.isSuccess){
+            // [上传程序]字段的值
+            this.customizeCuttingTool.cuttingToolPicture = response.data.url
+        }
+    },
+    // 文件上传失败时的钩子
+    handleCuttingToolPictureError(err, file, fileList){
+        console.log("文件上传失败~", err)
+    },
+    // 文件上传时的钩子
+    handleCuttingToolPicturePropress(event, file, fileList){
+        console.log("文件上传~", event)
+    },
+
+
+    // 文件列表移除文件时的钩子
+    handleCuttingToolInstallPictureRemove(file, fileList) {
+        console.log("删除事件：", file, fileList);
+        // 还原数据
+        this.resetCuttingToolInstallPictureFile()
+    },
+    // 点击文件列表中已上传的文件时的钩子
+    handleCuttingToolInstallPicturePreview(file) {
+        console.log("上传之前事件：",file);
+    },
+    // 文件超出个数限制时的钩子
+    handleCuttingToolInstallPictureExceed(files, fileList) {
+        this.$message.warning(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+    },
+    // 删除文件之前的钩子，参数为上传的文件和文件列表，若返回 false 或者返回 Promise 且被 reject，则停止删除。
+    beforeCuttingToolInstallPictureRemove(file, fileList) {
+        return this.$confirm(`确定移除 ${ file.name }？`);
+    },
+    // 文件上传成功时的钩子
+    handleCuttingToolInstallPictureSuccess(response, file, fileList){
+        console.log("文件上传成功!", response)
+        if(response.isSuccess){
+            // [上传程序]字段的值
+            this.customizeCuttingTool.cuttingToolInstallPicture = response.data.url
+        }
+    },
+    // 文件上传失败时的钩子
+    handleCuttingToolInstallPictureError(err, file, fileList){
+        console.log("文件上传失败~", err)
+    },
+    // 文件上传时的钩子
+    handleCuttingToolInstallPicturePropress(event, file, fileList){
+        console.log("文件上传~", event)
+    },
+    resetCuttingToolPictureFile(){
+        // [上传程序]字段的值
+        this.customizeCuttingTool.cuttingToolPicture = ''
+    },
+    resetCuttingToolInstallPictureFile(){
+        // [上传程序]字段的值
+        this.customizeCuttingTool.cuttingToolInstallPicture = ''
+    },
+    choose(val){
+			if(this.customizeCuttingTool.start!=null || this.customizeCuttingTool.start!=""){
+				//判断起始设备和目的设备是否一致 scope.row.cutterNo>0 ? scope.row.cutterNo: scope.row.storgeName
+				let params = {"pointId": this.customizeCuttingTool.start.replace("CT_","")}
+        toolbarApi.getCutToolDevice(qs.stringify(params)).then(response=>{
+          this.cutToolStorgeList = [{"name":"请选择","pointId":""}]
+					this.CutToolShelfList = []
+          this.$set(this.customizeCuttingTool, 'targetPointId', null);
+          this.$set(this.customizeCuttingTool, 'cutGoalNo', null);
+
+          const res = response.data
+          if(res.data == null){
+            this.$message({
+                          message: "没有查询到设备",
+                          type: 'warning'
+                    })
+            return false
+				  }
+
+          if(res.isSuccess){
+            let item = this.cutToolDeviceList.filter(item=>item.code==val); 
+            let resourceId = res.data.resourceId					
+            if(resourceId == item[0].id){
+              
+					    this.cutToolStorgeList = [];
+              this.$message({
+                          message: "起始设备和目的设备不能一样",
+                          type: 'warning'
+                    })
+              return false
+            } 
+                      
+            console.log("获取目的地所有可用的站点信息")
+            let params2 = {"code":val,"cutterNo":this.customizeCuttingTool.cutterT}
+            toolbarApi.cutToolPositionList(params2).then(response2=>{
+              const res2 = response2.data
+              if(res2.isSuccess){
+                let tempList = res2.data
+                if(tempList.length==0){
+                    this.$message({
+                          message: "目的点位不满足，确认目的点位是否为空",
+                          type: 'warning'
+                    })
+                }else {
+                  this.cutToolStorgeList = tempList.map(item=>{
+                    item.pointId = "CT_"+item.pointId
+                    return item;
+                  })
+                }
+                //console.log(this.cutToolStorgeList)
+              }
+            }).finally(()=>{
+              return true		
+            })
+                      
+            console.log("查询刀架号")
+            toolbarApi.getCutToolShelfDevice(params2).then(response2=>{
+              const res3 = response2.data
+              if(res3.isSuccess){
+                if(res3.msg == "1000"){
+                  this.cutGoalNoIsShow = false
+                }else {
+                  this.cutGoalNoIsShow = true
+                  this.CutToolShelfList = res3.data
+                }
+              }
+
+
+            }).finally(()=>{
+              return true		
+            })
+
+          }
+			  }).finally(()=>{
+				  return true		
+			  })
+			}			   
+		},
+  }
+}
+</script>
+<style lang="scss" >
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: #409eff;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 100px;
+  height: 100px;
+  line-height: 100px;
+  text-align: center;
+}
+.avatar {
+  width: 100px;
+  height: 100px;
+  display: block;
+}
+.checkUsed{
+	display: inline-block;
+	margin-left: 10px;
+	color: #1890ff;
+}
+.custom-dropdown .el-select-dropdown__list {
+  display: flex; /* 或者使用 grid, table 等布局方式 */
+  flex-direction: column; /* 对于表格布局，可能需要调整 */
+}
+.custom-dropdown .el-select-dropdown__item {
+  display: flex; /* 或者使用 grid, table 等布局方式 */
+  justify-content: space-between; /* 确保内容均匀分布 */
+}
+</style>

imcs-ui/src/views/zuihou/centralToolMagazine/cutterCategoriesGroup/tab/partNeedGroupCutter/index.vue

@@ -76,6 +76,7 @@
 	      	<el-button type="primary" icon="el-icon-suitcase" size="medium" v-has-permission="['classSchedule:audit']" @click="audioBtn()">{{$t("common.audio.audio")}}</el-button> -->
 			<el-button type="primary" icon="el-icon-plus" size="medium" v-has-permission="['classSchedule:add']" @click="add">{{ $t("common.add") }}</el-button>
 			<el-button  type="primary" icon="el-icon-c-scale-to-original" size="medium" v-has-permission="['classSchedule:audit']" @click="openDrawerWin()">导入零件刀具需求</el-button>
+	      	<el-button type="primary" icon="el-icon-location-information" size="medium" @click="locationBtn()">{{$t("common.audio.locationManagement")}}</el-button>
 		</el-col>
     </el-row>
 
@@ -100,47 +101,52 @@
 		<el-table-column prop="bomName" label='零件名称' width="200px"></el-table-column>
 		<el-table-column prop="partsNo" label='零件编号' width="160px"></el-table-column>
 		<el-table-column prop="drawingNo" label='图号' width="160px"></el-table-column>
+		<el-table-column
+			type="selection"
+			width="55"
+			align="center">
+		</el-table-column>
 		<el-table-column prop="cutterT" label='刀号' width="80px"></el-table-column>
 		<el-table-column prop="cutterName" label='刀具名' width="260px"></el-table-column>
-		<el-table-column prop="needCutterLife" label='所需刀具寿命' width="110px"></el-table-column>
-		<el-table-column prop="priority" label='优先级' width="80px"></el-table-column>
 		<el-table-column prop="cuttingToolType" label='刀具类型' width="100px">
 			<template slot-scope="scope">
 				{{ translateCode(scope.row.cuttingToolType) }}
 			</template>
 		</el-table-column>
-      <el-table-column prop="deviceName" label='所在设备' width="260px">
+		<el-table-column prop="deviceName" label='所在设备' width="260px">
 			<template slot-scope="scope">{{scope.row.dkPointId!=null ? scope.row.dkDeviceName: scope.row.jcPointId!=null? scope.row.jcDeviceName : '线外' }}</template>
-	  </el-table-column>
-      <el-table-column prop="status" label='位置' width="160px">
+		</el-table-column>
+		<el-table-column prop="status" label='位置' width="160px">
 		<template slot-scope="scope">{{scope.row.dkPointId!=null ? scope.row.dkStorgeName: scope.row.jcPointId!=null? scope.row.jcPointName : '线外' }}</template>
-	  </el-table-column>
-      <el-table-column prop="cutterSort" label='使用顺序' width="80px"></el-table-column>
-      <!-- 操作 -->
-      <el-table-column
-        :label="$t('table.operation')"
-        fixed="right"
-        align="center"
-        column-key="operation"
-        width="80px"
-      >
-        <template slot-scope="{ row }">
-          <el-tooltip  class="item" content='位置管理' effect="dark" placement="top-start" v-if=" row.dkPointId!=null || row.jcPointId!=null" >
-            <i
-              class="el-icon-location-information table-operation"
-              style="color: #2db7f5;"
-              @click="edit(row)"
-            />
-          </el-tooltip>
-          <el-tooltip  class="item" content='删除' effect="dark" placement="top-start" >
-            <i
-              class="el-icon-delete table-operation"
-              style="color:crimson;"
-              @click="singleDelete(row)"
-            />
-          </el-tooltip>
-        </template>
-      </el-table-column>
+		</el-table-column>
+		<el-table-column prop="needCutterLife" label='所需刀具寿命' width="110px"></el-table-column>
+		<el-table-column prop="priority" label='优先级' width="80px"></el-table-column>
+		<el-table-column prop="cutterSort" label='使用顺序' width="80px"></el-table-column>
+		<!-- 操作 -->
+		<el-table-column
+		:label="$t('table.operation')"
+		fixed="right"
+		align="center"
+		column-key="operation"
+		width="80px"
+		>
+		<template slot-scope="{ row }">
+			<el-tooltip  class="item" content='位置管理' effect="dark" placement="top-start" v-if=" row.dkPointId!=null || row.jcPointId!=null" >
+			<i
+				class="el-icon-location-information table-operation"
+				style="color: #2db7f5;"
+				@click="edit(row)"
+			/>
+			</el-tooltip>
+			<el-tooltip  class="item" content='删除' effect="dark" placement="top-start" >
+			<i
+				class="el-icon-delete table-operation"
+				style="color:crimson;"
+				@click="singleDelete(row)"
+			/>
+			</el-tooltip>
+		</template>
+		</el-table-column>
     </el-table>
     <pagination
       v-show="tableData.total > 0"
@@ -170,8 +176,16 @@
 		@success="editSuccess"
 	  />
 	</div>
-
-	
+	<!-- 多条同时变更目的位置 -->
+	<div>
+	  <EditMore
+		ref="editMore"
+		:dialog-visible="moreDialog.isVisible"
+		:title="moreDialog.title"
+		@close="editCloseMore"
+		@success="editSuccessMore"
+	  />
+	</div>
 
   </div>
 
@@ -186,12 +200,13 @@
 	//分页
 	import Pagination from "@/components/Pagination"
 	import Edit from "./components/Edit"
+	import EditMore from "./components/EditMore"
 	import  CutterGroup from './components/CutterGroup'
 
 	import { convertEnum } from '@/utils/utils'
 	export default {
 	  name: "WarehouseTypeMgr",
-	  components: { Pagination , Edit, CutterGroup},
+	  components: { Pagination , Edit , EditMore , CutterGroup},
 	  props: {
 	  },
 	  data () {
@@ -311,6 +326,10 @@
 	        isVisible: false,
 	        title: ""
 	      },
+	      moreDialog: {
+	        isVisible: false,
+	        title: ""
+	      },
 	      needCutters: {
 	        isVisible: false,
 	        title: ""
@@ -477,18 +496,18 @@
 	    // 【审核产品】-按钮事件
 	    audioBtn(){
 	    	if (!this.selection.length) {
-	        this.$message({
-	          message: this.$t("tips.noDataSelected"),
-	          type: "warning"
-	        })
+				this.$message({
+				message: this.$t("tips.noDataSelected"),
+				type: "warning"
+				})
 	        return
 	      }
 	    	if (this.selection.length > 1) {
-	        this.$message({
-	          message: this.$t("tips.mustOne"),
-	          type: "warning"
-	        })
-	        return
+				this.$message({
+				message: this.$t("tips.mustOne"),
+				type: "warning"
+				})
+				return
 	      }
 	    	this.audioIsVisible = true
 	    },
@@ -541,6 +560,12 @@
 	    editSuccess () {
 	      this.search()
 	    },
+	    editCloseMore () {
+	      this.moreDialog.isVisible = false
+	    },
+	    editSuccessMore () {
+	      this.search()
+	    },
 	    editCloseCutters () {
 	      this.needCutters.isVisible = false
 	    },
@@ -699,6 +724,52 @@
 	      if (!flag) {
 	        this.$refs.table.toggleRowSelection(row, true)
 	      }
+	    },
+	    locationBtn(){
+	    	if (!this.selection.length || this.selection.length<=0) {
+				this.$message({
+				message: this.$t("tips.noDataSelected"),
+				type: "warning"
+				})
+				return
+			}
+
+			// 判断选择的位置是否都是一样的
+			let isManzu = true;
+			let dkOrJc = this.selection[0].dkDeviceCode
+			this.selection.map(item => {
+				if (this.selection[0].dkDeviceCode ==null && this.selection[0].jcDeviceCode == null) {
+					isManzu = false;
+				}
+				if(dkOrJc!=null && item.dkDeviceCode != dkOrJc){
+					isManzu = false;
+				}
+				
+				console.log("=="+item)
+			})
+
+			// 判断是否满足
+			if(!isManzu){
+				if (this.selection[0].dkDeviceCode ==null && this.selection[0].jcDeviceCode == null) {
+					this.$message({
+					message: this.$t("需求刀具在线外请使用，刀具装在站进刀"),
+					type: "warning"
+					})
+				}else {
+					this.$message({
+					message: this.$t("起点设备位置不一致"),
+					type: "warning"
+					})
+				}
+				return
+			}
+
+			// 打开界面
+			this.$refs.editMore.setTenantMore(this.selection, this.dicts)
+			this.$refs.editMore.type = "edit"
+			this.moreDialog.title = this.$t("common.edit")
+			this.moreDialog.isVisible = true
+
 	    },
 		openDrawerWin (){
 			console.log("打开弹框");

imcs-ui/src/views/zuihou/runManageCenter/mesNotice/tab/accept/index.vue

@@ -78,8 +78,8 @@
       <!-- CheckBox -->
       <el-table-column align="center" type="selection" width="50" :reserve-selection="true" />
       <!-- 编码 -->
-      <el-table-column prop="orderNo" label='订单编号' :show-overflow-tooltip="true" width="160"></el-table-column>
-      <!-- 设备 -->
+      <el-table-column prop="orderNo" label='订单编号' :show-overflow-tooltip="true" width="180"></el-table-column>
+      <el-table-column prop="lineCode"  label='产线编码' width="180"></el-table-column>
       <el-table-column prop="buType" label='业务类型' width="120" >
 		<template slot-scope="{ row }">			
 			 <div v-for="item in buTypeList" :key="item.value" :value="item" >				
@@ -87,11 +87,6 @@
 			 </div>
 		  </template>
 	  </el-table-column>
-	  <el-table-column prop="source"  label='数据来源' width="100"></el-table-column>
-	  <el-table-column prop="targetSource"  label='数据流向' width="100"></el-table-column>
-      <!-- 报警内容 -->
-      <el-table-column prop="lineCode"  label='产线编码' width="100"></el-table-column>
-      <!-- 报警时间 -->
 	  <el-table-column prop="apiType" label='接口类型' width="200" >
 		  <template slot-scope="{ row }">			
 			 <div v-for="item in apiTypeList" :key="item.value" :value="item" >				
@@ -99,8 +94,14 @@
 			 </div>
 		  </template>
 	  </el-table-column>
-      <el-table-column prop="apiAddress" label='接口地址' align="center" width="200px"></el-table-column>
-      <el-table-column prop="createTime" label='创建时间' width="160px"></el-table-column>
+	  <!-- <el-table-column prop="apiType" label='接口类型' width="120"  align="center" >
+			<template slot-scope="scope">
+				 <el-tag>{{ translateCodeApi(scope.row.apiType) }}</el-tag>
+			</template>
+	  </el-table-column> -->
+	  <el-table-column prop="source"  label='数据来源' width="160"></el-table-column>
+	  <el-table-column prop="targetSource"  label='数据流向' width="160"></el-table-column>
+      <!-- <el-table-column prop="apiAddress" label='接口地址' align="center" width="200px"></el-table-column> -->
       <!-- 处理状态 -->
       <el-table-column prop="status" label='状态' align="center" width="120px">
       	<template slot-scope="{ row }">
@@ -110,8 +111,9 @@
 	      	    <el-tag v-if="row.status == '99'">异常</el-tag>
 		</template>
       </el-table-column>
+      <el-table-column prop="createTime" label='创建时间'></el-table-column>
       <!-- 处理时间 -->
-      <el-table-column prop="updateTime" :label='$t("developer.table.warnLong.chuliTime")' width="160px">
+      <el-table-column prop="updateTime" :label='$t("developer.table.warnLong.chuliTime")' >
 	     <template slot-scope="{ row }">
 	         <span v-if="row.status == '1'">{{row.updateTime}}</span>
 	     </template>
@@ -124,14 +126,21 @@
 		    column-key="operation"
 		    width="85px">
 			<template slot-scope="{ row }">		        	
-				  <el-tooltip class="item" content='执行处理' effect="dark" placement="top-start" v-if="row.status=='1'">
+				  <el-tooltip class="item" content='执行处理' effect="dark" placement="top-start" v-if="row.status=='0' || row.status=='1'  ">
 			          <i					    
 			            class="el-icon-bell table-operation"
 			            style="color: #87d068;"
 			            @click="updateStatus(row)"
 			          />
 		          </el-tooltip>
-				  <el-tooltip class="item" content='页面跳转' effect="dark" placement="top-start" v-if="row.status=='0'">
+				  <el-tooltip class="item" content='查看' effect="dark" placement="top-start" >
+			          <i
+			            class="el-icon-download table-operation"
+			            style="color: #87d068;"
+			            @click="view(row)"
+			          />
+		          </el-tooltip>
+				  <el-tooltip class="item" content='页面跳转' effect="dark" placement="top-start" v-if="row.status=='1'">
 			          <i
 			            class="el-icon-bell table-operation"
 			            style="color: #87d068;"
@@ -203,7 +212,8 @@
 	  },
 	  data () {
 	    return {
-	      audioStatus: [],
+	    //   audioStatus: [],
+		buType:'TASKDISTRIBUTE', //业务功能，1接受，2申请
 	      dialog: {
 	        isVisible: false,
 	        title: ""
@@ -259,21 +269,25 @@
 	  // 实例已经在内存中创建好，此时data和methods已将ok,如果要操作data中的数据或是调用methods中的方法，最早只能在created中操作
 	  created() {
 	  	// 调用常量-审核状态
-	  	this.audioStatus = this.$constWKS.OPTTYPE
+	  	// this.audioStatus = this.$constWKS.OPTTYPE
 	  	// 加载【字典】
-	  	initDicts(['API_TYPE','BU_TYPE'], this.dicts);		
-	  	// 加载列表数据
-	  	this.fetch()
+	  	initDicts(['API_TYPE','BU_TYPE'], this.dicts);	
+		
+		setTimeout(function() {
+		}, 2000);
+		// 加载列表数据
+		this.fetch()
 		},
 	  computed: {
 	    currentUser () {
 	      return this.$store.state.account.user
 	    },
 	    apiTypeList() {
-        return convertEnum(this.dicts.API_TYPE)
+        	return convertEnum(this.dicts.API_TYPE)
         },
 		buTypeList() {
-        return convertEnum(this.dicts.BU_TYPE)
+			console.log("==="+this.dicts.BU_TYPE)
+        	return convertEnum(this.dicts.BU_TYPE)
         }
 	  },
 	  mounted () {
@@ -427,8 +441,9 @@
 	      this.dialog.title = this.$t("common.edit")
 	      this.dialog.isVisible = true
 	    },
-	    fetch (params = {}) {
-	      this.loading = true		  
+	    async fetch (params = {}) {
+	      this.loading = true	
+		  this.queryParams.model.buType = this.buType	  
 	      if (this.queryParams.timeRange) {
 	        this.queryParams.map.createTime_st = this.queryParams.timeRange[0]
 	        this.queryParams.map.createTime_ed = this.queryParams.timeRange[1]
@@ -442,7 +457,7 @@
 	      this.queryParams.size = params.size ? params.size : this.queryParams.size
 	      // 固定参数：dataStatus = 1-入库/出库，2-解锁/锁定
 	      //this.queryParams.model.status = '1'		  
-	      mesNoticeApi.page(this.queryParams).then(response => {
+	     await mesNoticeApi.page(this.queryParams).then(response => {
 	        const res = response.data
 	        if (res.isSuccess) {
 	          this.tableData = res.data
@@ -468,7 +483,14 @@
 	      if (!flag) {
 	        this.$refs.table.toggleRowSelection(row, true)
 	      }
-	    }
+	    },
+		translateCodeApi (code) {
+			return this.dicts.API_TYPE[code] || '未知'; 
+		},
+		translateCodeBu (code) {
+			return this.dicts.BU_TYPE[code] || '未知'; 
+		}
+
 	  }
 	}
 </script>

imcs-ui/src/views/zuihou/runManageCenter/mesNotice/tab/apply/components/Edit.vue

@@ -9,14 +9,26 @@
   	top="50px"
   >
     <el-form ref="form" :model="tenant" :rules="rules" label-position="right" label-width="130px">
-      <el-form-item :label='$t("lineSide.form.name")' prop="name">
-          <el-input v-model="tenant.name" :placeholder='$t("common.pleaseEnter")'/>
+      <el-form-item label='订单编号' prop="orderNo">
+          <el-input v-model="tenant.orderNo" :placeholder='$t("common.pleaseEnter")' disabled/>
       </el-form-item>
-      <el-form-item :label='$t("lineSide.form.status")' prop="status">
-        <template>
-				  <el-radio v-model="tenant.status" label="1">{{$t("common.show")}}</el-radio>
-				  <el-radio v-model="tenant.status" label="0">{{$t("common.hide")}}</el-radio>
-				</template>
+      <el-form-item label='业务类型' prop="buType">
+          <el-input v-model="tenant.buType" :placeholder='$t("common.pleaseEnter")'/>
+      </el-form-item>
+      <el-form-item label='数据来源' prop="source">
+          <el-input v-model="tenant.source" :placeholder='$t("common.pleaseEnter")'/>
+      </el-form-item>
+      <el-form-item label='数据流向' prop="targetSource">
+          <el-input v-model="tenant.targetSource" :placeholder='$t("common.pleaseEnter")'/>
+      </el-form-item>
+      <el-form-item label='产线编码' prop="lineCode">
+          <el-input v-model="tenant.lineCode" :placeholder='$t("common.pleaseEnter")'/>
+      </el-form-item>
+      <el-form-item label='接口类型' prop="apiType">
+          <el-input v-model="tenant.apiType" :placeholder='$t("common.pleaseEnter")'/>
+      </el-form-item>
+      <el-form-item label='接口地址' prop="apiAddress">
+          <el-input v-model="tenant.apiAddress" :placeholder='$t("common.pleaseEnter")'/>
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -26,9 +38,11 @@
   </el-dialog>
 </template>
 <script>
-// 【仓库类型管理】-API
+// API
 import warehouseTypeMgrApi from "@/api/modelingCenter/warehouseTypeMgr"
 
+import mesNoticeApi from "@/api/runManageCenter/mesNotice"
+
 export default {
   name: 'TenantEdit',
   props: {
@@ -146,7 +160,7 @@ export default {
         })
     },
     update () {
-      warehouseTypeMgrApi.update(this.tenant)
+      mesNoticeApi.modify(this.tenant)
         .then((response) => {
           const res = response.data
           if (res.isSuccess) {

imcs-ui/src/views/zuihou/runManageCenter/mesNotice/tab/apply/index.vue

@@ -123,7 +123,14 @@
 		    align="center"
 		    column-key="operation"
 		    width="85px">
-			<template slot-scope="{ row }">		        	
+			<template slot-scope="{ row }">
+				  <el-tooltip class="item" content='修改' effect="dark" placement="top-start" v-if="row.status!='2'">
+			          <i					    
+			            class="el-icon-edit table-operation"
+			            style="color: #87d068;"
+			            @click="edit(row)"
+			          />
+		          </el-tooltip>      	
 				  <el-tooltip class="item" content='执行处理' effect="dark" placement="top-start" v-if="row.status=='1'">
 			          <i					    
 			            class="el-icon-bell table-operation"
@@ -203,6 +210,7 @@
 	  },
 	  data () {
 	    return {
+		  buType:"TASKAPPLY",
 	      audioStatus: [],
 	      dialog: {
 	        isVisible: false,
@@ -259,11 +267,11 @@
 	  // 实例已经在内存中创建好，此时data和methods已将ok,如果要操作data中的数据或是调用methods中的方法，最早只能在created中操作
 	  created() {
 	  	// 调用常量-审核状态
-	  	this.audioStatus = this.$constWKS.OPTTYPE
+	  	// this.audioStatus = this.$constWKS.OPTTYPE
 	  	// 加载【字典】
-	  	initDicts(['API_TYPE','BU_TYPE'], this.dicts);		
-	  	// 加载列表数据
-	  	this.fetch()
+	  	// initDicts(['API_TYPE','BU_TYPE'], this.dicts);		
+	  	// // 加载列表数据
+	  	// this.fetch()
 		},
 	  computed: {
 	    currentUser () {
@@ -428,7 +436,8 @@
 	      this.dialog.isVisible = true
 	    },
 	    fetch (params = {}) {
-	      this.loading = true		  
+	      this.loading = true	
+		  this.queryParams.model.buType = this.buType	 
 	      if (this.queryParams.timeRange) {
 	        this.queryParams.map.createTime_st = this.queryParams.timeRange[0]
 	        this.queryParams.map.createTime_ed = this.queryParams.timeRange[1]

imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/outNewOrder/index.vue

@@ -133,10 +133,12 @@
       <!-- 审核状态 -->
       <el-table-column prop="auditStatus" :label='$t("runCenter.table.oder.auditStatus")' align="center" style="width: 8%;">
       	<template slot-scope="{ row }">
-	      	<el-tag v-if="row.auditStatus == '1'" type="info">{{$t("common.audio.daiAudio")}}</el-tag>
-					<el-tag v-if="row.auditStatus == '2'" type="success">{{$t("common.audio.audioOk")}}</el-tag>
-					<el-tag v-if="row.auditStatus == '3'" type="danger">{{$t("common.audio.aduioFail")}}</el-tag>
-				</template>
+			
+			<el-tag v-if="row.auditStatus == '0'" type="info">{{$t("common.audio.notSubmitted")}}</el-tag>
+			<el-tag v-if="row.auditStatus == '1'" type="info">{{$t("common.audio.daiAudio")}}</el-tag>
+			<el-tag v-if="row.auditStatus == '2'" type="success">{{$t("common.audio.audioOk")}}</el-tag>
+			<el-tag v-if="row.auditStatus == '3'" type="danger">{{$t("common.audio.aduioFail")}}</el-tag>
+		</template>
       </el-table-column>
       <!-- 启用状态 -->
       <el-table-column prop="status" :label='$t("runCenter.table.oder.status")' :show-overflow-tooltip="true" style="width: 8%;">
@@ -300,19 +302,20 @@
 	  	// 【提交审核】按钮-事件
 	    audioStatu(status){
 	    	if (!this.selection.length) {
-	        this.$message({
-	          message: this.$t("tips.noDataSelected"),
-	          type: "warning"
-	        })
-	        return
-	      }
+				this.$message({
+				message: this.$t("tips.noDataSelected"),
+				type: "warning"
+				})
+				return
+			}
 	    	if (this.selection.length > 1) {
 	        this.$message({
-	          message: this.$t("tips.mustOne"),
-	          type: "warning"
-	        })
-	        return
-	      }
+				message: this.$t("tips.mustOne"),
+				type: "warning"
+				})
+				return
+			}
+
 	    	// 确认【提交审核】
 	    	this.$confirm(this.$t("tips.audioTips"), this.$t("common.tips"), {
 	      	distinguishCancelAndClose: true,
@@ -338,7 +341,13 @@
 	    	if(status == "3"){
 	    		msg = this.$t("common.audio.aduioFail")+"！"
 	    	}
-	    	orderMgrApi.updateStatus({ id: this.selection[0].id, auditStatus: status}).then(response => {
+	    	// 多选id的list
+	    	let idList = []
+	    	this.selection.map(item => {
+	    		idList.push(item.id)
+	    	})
+
+	    	orderMgrApi.updateStatus({ ids: idList, auditStatus: status}).then(response => {
 	        if (response.status == 200) {
 	        	// 如果是审核，成功后，关闭弹出框
 	        	if(status == '2' || status == '3'){