Browse Source

优化前端代办界面

wang.sq@aliyun.com 1 week ago
parent
commit
adcd616bd5

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

@@ -323,14 +323,6 @@ export default {
                   })
                   return
               }
-            }else {
-              if(this.cutToolStorgeList.length < this.customizeCuttingToolMore.length){
-                  this.$message({
-                        message: "目的点位空位置不够存放",
-                        type: 'warning'
-                  })
-                  return
-              }
             }
           
           this.confirmDisabled = true
@@ -346,7 +338,7 @@ export default {
       })
     },
     save () {
-  	    console.log(this.customizeCuttingTool)
+  	  console.log(this.customizeCuttingTool)
       classScheduleMgrApi.partNeedCuttersave(this.customizeCuttingTool)
         .then((response) => {
           const res = response.data
@@ -356,6 +348,7 @@ export default {
               message: this.$t('tips.createSuccess'),
               type: 'success'
             })
+            
             // 通知列表
 	          this.$emit("success");
 	          // 通知列表-并关闭弹出框
@@ -376,9 +369,10 @@ export default {
                 if (res.isSuccess) {
                     this.loading = false		  
                     this.$message({
-                        message: res.data,
-                        type: 'success'
-                      })
+                      dangerouslyUseHTMLString: true,
+                      type: 'success',
+                      message: res.data
+                    });
                     //通知列表-并关闭弹出框
                     this.$emit("close");
                 }

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

@@ -29,6 +29,19 @@
           size="medium"
         />
       </span>
+      <span>
+        <span>当前位置:</span>
+		<el-select v-model="queryParams.model.thisCutterLocation" placeholder="当前位置" >
+			<el-option clearable v-for="device in cutToolDeviceList" :label="device.name" :value="device.code" :key="device.code" ></el-option>		
+		</el-select>
+        <!-- <el-input
+          v-model="queryParams.model.thisCutterLocation"
+          :placeholder="$t('common.pleaseEnter')"
+          style="width: 150px"
+          size="medium"
+        /> -->
+      </span>
+
       <!-- <span style="margin-left: 15px">
         <span>刀具类型:</span>
         <el-select v-model="queryParams.model.cutterTyp" clearable :placeholder="$t('common.pleaseEnter')">
@@ -193,6 +206,7 @@
 
 
 <script>
+	import equipmentMgrApi from "@/api/resourceProductMgr/equipmentMgr"	
 	import classScheduleMgrApi from "@/api/modelingCenter/cutterCategoriesGroup"
 	import { initDicts, initQueryParams } from '@/utils/commons'
 
@@ -359,7 +373,8 @@
 	      enums: {
 	        TenantTypeEnum: {},
 	        TenantStatusEnum: {}
-	      }
+	      },
+		  cutToolDeviceList: []
 	    }
 	  },
 	  // 实例已经在内存中创建好,此时data和methods已将ok,如果要操作data中的数据或是调用methods中的方法,最早只能在created中操作
@@ -383,6 +398,7 @@
       }
 	  },
 	  mounted () {
+		this.findeDeviceCode()
 	  },
 	  methods: {
 		spanMethod({rowIndex,columnIndex}) {
@@ -788,6 +804,19 @@
 		translateCode (code) {
 			console.log("---")
 			return this.dicts.CUTTING_TOOL_TYPE[code] || '未知'; 
+		},
+		findeDeviceCode () {
+			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(() => (this.loading = false));	     
 		}
 
 		

+ 29 - 13
imcs-ui/src/views/zuihou/runManageCenter/mesNotice/tab/accept/components/View.vue

@@ -5,9 +5,10 @@
     :append-to-body="true"
     :visible.sync="isVisible"
     class="tenant-view"
+    width="55%"
   >
     <div>
-          <el-timeline>
+          <el-timeline >
             <el-timeline-item
               v-for="(activity, index) in dataList"
               color="#0bbd87"
@@ -17,15 +18,19 @@
               :size="activity.size"
               :timestamp="activity.createTime"
               placement="top">
-              <el-descriptions :title="用户信息">
-                  <el-descriptions-item label="用户名">{{activity.timestamp}}</el-descriptions-item>
-                  <el-descriptions-item label="手机号">18100000000</el-descriptions-item>
-                  <el-descriptions-item label="居住地">苏州市</el-descriptions-item>
-                  <el-descriptions-item label="备注">
-                    <el-tag size="small">学校</el-tag>
-                  </el-descriptions-item>
-                  <el-descriptions-item label="联系地址">江苏省苏州市吴中区吴中大道 1188 号</el-descriptions-item>
+
+              <el-descriptions :title="activity.statusName" direction="vertical" :column="2" border>
+                  <el-descriptions-item span="1" label="数据来源">{{activity.source}}</el-descriptions-item>
+                  <el-descriptions-item span="1" label="数据流向">{{activity.targetSource}}</el-descriptions-item>
+                  <!-- <el-descriptions-item label="业务数据">{{activity.acceptPar}}</el-descriptions-item> -->
+                    <el-descriptions-item span="2" label="业务数据" >{{activity.acceptPar}}</el-descriptions-item>
               </el-descriptions>
+
+              <!-- <el-descriptions :title="activity.statusName">
+                  <el-descriptions-item label="数据来源">{{activity.source}}</el-descriptions-item>
+                  <el-descriptions-item label="数据流向">{{activity.targetSource}}</el-descriptions-item>
+                  <el-descriptions-item label="业务数据">{{activity.acceptPar}}</el-descriptions-item>
+              </el-descriptions> -->
             </el-timeline-item>
           </el-timeline>
     </div>
@@ -63,14 +68,17 @@ export default {
       taskNodeId: '',
       deviceId: '',
       logId:'',
-      status: [{
+      statusList: [{
           value: '0',
-          label: '处理'
+          label: '处理'
         }, {
           value: '1',
           label: '未处理'
         }, {
-          value: '2',
+          value: '3',
+          label: '已处理'
+        }, {
+          value: '99',
           label: '异常'
         }],
       callbackId: '',
@@ -121,7 +129,15 @@ export default {
         mesNoticeLogApi.getList(this.tenant).then(response => {
 	        const res = response.data
 	        if (res.isSuccess) {
-	          this.dataList = res.data
+	          this.dataList = []
+            res.data.map( item=> {
+                this.statusList.map(data =>{
+                  if(data.value == item.status){
+                    item.statusName = data.label
+                  }
+                })
+                this.dataList.push(item)
+            })
 	        }	        
 	      }).finally(() => this.loading = false)       
     },

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

@@ -105,9 +105,9 @@
       <!-- 处理状态 -->
       <el-table-column prop="status" label='状态' align="center" width="120px">
       	<template slot-scope="{ row }">
-      		    <el-tag v-if="row.status == '0'" >未处理</el-tag>
-	      	    <el-tag v-if="row.status == '1'">处理中</el-tag>
-	      	    <el-tag v-if="row.status == '2'">已处理</el-tag>
+      		    <el-tag v-if="row.status == '1'" >未处理</el-tag>
+	      	    <el-tag v-if="row.status == '0'">处理中</el-tag>
+	      	    <el-tag v-if="row.status == '3'">已处理</el-tag>
 	      	    <el-tag v-if="row.status == '99'">异常</el-tag>
 		</template>
       </el-table-column>
@@ -133,9 +133,9 @@
 			            @click="updateStatus(row)"
 			          />
 		          </el-tooltip>
-				  <el-tooltip class="item" content='查看' effect="dark" placement="top-start" >
+				  <el-tooltip class="item" content='任务跟踪' effect="dark" placement="top-start" >
 			          <i
-			            class="el-icon-view table-operation"
+			            class="el-icon-position table-operation"
 			            style="color: #87d068;"
 			            @click="view(row)"
 			          />