2022-03-15 23:25

imcs-ui/src/views/zuihou/qualityCenter/qualityMgr/Index.vue

@@ -53,7 +53,7 @@
     <el-row class="filter-container">
     	<el-col>
     		<!--<el-button type="success" icon="el-icon-plus" size="medium" @click="add">{{ $t("machining.common.marking") }}</el-button>-->
-	      <el-button v-has-permission="['quality:view']" type="primary" icon="el-icon-view" size="medium" @click="editOne">
+	      <el-button v-has-permission="['quality:view']" type="primary" icon="el-icon-view" size="medium" @click="viewOne">
 	        {{ $t("machining.common.viewOrder") }}
 	      </el-button>
     	</el-col>
@@ -120,7 +120,7 @@
 	          <i
 	            class="el-icon-view table-operation"
 	            style="color: #87d068;"
-	            @click="edit(row)"
+	            @click="view(row)"
 	          />
           </el-tooltip>
         </template>
@@ -145,6 +145,7 @@
       :dialog-visible="tenantViewVisible"
       @close="viewClose"
     />
+    
     <el-dialog
       v-el-drag-dialog
       :close-on-click-modal="false"
@@ -329,6 +330,27 @@
 	        }
 	      })
 	    },
+	    
+	    // 【查看补单】按钮-事件
+	    viewOne () {
+	    	if (!this.selection.length) {
+	        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.view(this.selection[0]);
+	    },
+	    
+	    // 【查看补单-Row】按钮-事件
 	    view (row) {
 	      this.$refs.view.setTenant(row)
 	      this.tenantViewVisible = true

imcs-ui/src/views/zuihou/qualityCenter/qualityMgr/components/View.vue

@@ -1,214 +1,170 @@
-<template>
-  <el-dialog
-    :title="$t(&quot;common.view&quot;)"
-    :width="width"
-    :append-to-body="true"
-    :visible.sync="isVisible"
-    class="tenant-view"
-  >
-    <el-row :gutter="10">
-      <el-col :xs="24" :sm="24">
-        <div class="img-wrapper">
-          <img :src="tenant.logo">
-        </div>
-      </el-col>
-    </el-row>
-    <el-row :gutter="10">
-      <el-col :xs="24" :sm="12">
-        <div class="view-item">
-          <i class="el-icon-user" />
-          <span>{{ $t('table.tenant.code') +'：' }}</span>
-          {{ tenant.code }}
-        </div>
-      </el-col>
-      <el-col :xs="24" :sm="12">
-        <div class="view-item">
-          <i class="el-icon-suitcase" />
-          <span>{{ $t('table.tenant.name') +'：' }}</span>
-          {{ tenant.name }}
-        </div>
-      </el-col>
-    </el-row>
-    <el-row :gutter="10">
-      <el-col :xs="24" :sm="12">
-        <div class="view-item">
-          <i class="el-icon-trophy" />
-          <span>{{ $t('table.tenant.type') +'：' }}</span>
-          {{ tenant.type.desc }}
-        </div>
-      </el-col>
-      <el-col :xs="24" :sm="12">
-        <div class="view-item">
-          <i class="el-icon-phone-outline" />
-          <span>{{ $t('table.tenant.status') +'：' }}</span>
-          {{ tenant.status.desc }}
-        </div>
-      </el-col>
-    </el-row>
-    <el-row :gutter="10">
-      <el-col :xs="24" :sm="12">
-        <div class="view-item">
-          <i class="el-icon-star-off" />
-          <span>{{ $t('table.tenant.duty') +'：' }}</span>
-          {{ tenant.duty }}
-        </div>
-      </el-col>
-      <el-col :xs="24" :sm="12">
-        <div class="view-item">
-          <i class="el-icon-bangzhu" />
-          <span>{{ $t('table.tenant.expirationTime') +'：' }}</span>
-          {{ tenant.expirationTime ? tenant.expirationTime : '永久' }}
-        </div>
-      </el-col>
-    </el-row>
-    <el-row :gutter="10">
-      <el-col :xs="24" :sm="12">
-        <div class="view-item">
-          <i class="el-icon-time" />
-          <span>{{ $t('table.createTime') +'：' }}</span>
-          {{ tenant.createTime }}
-        </div>
-      </el-col>
-      <el-col :xs="24" :sm="12">
-        <div class="view-item">
-          <i class="el-icon-brush" />
-          <span>{{ $t('table.updateTime') +'：' }}</span>
-          {{ tenant.updateTime }}
-        </div>
-      </el-col>
-    </el-row>
-    <!--    <el-row :gutter='10'>-->
-    <!--      <el-col :xs='24' :sm='12'>-->
-    <!--        <div class='view-item'>-->
-    <!--          <i class='el-icon-date' />-->
-    <!--          <span>{{ $t('table.tenant.isMultipleLogin') +'：' }}</span>-->
-    <!--          {{ tenant.isMultipleLogin ? '是' : '否'}}-->
-    <!--        </div>-->
-    <!--      </el-col>-->
-    <!--      <el-col :xs='24' :sm='12'>-->
-    <!--        <div class='view-item'>-->
-    <!--          <i class='el-icon-document' />-->
-    <!--          <span>{{ $t('table.tenant.passwordExpire') +'：' }}</span>-->
-    <!--          {{ tenant.passwordExpire == '0' ? '永久有效' :tenant.passwordExpire}}-->
-    <!--        </div>-->
-    <!--      </el-col>-->
-    <!--    </el-row>-->
-    <!--    <el-row :gutter='10'>-->
-    <!--      <el-col :xs='24' :sm='12'>-->
-    <!--        <div class='view-item'>-->
-    <!--          <i class='el-icon-document' />-->
-    <!--          <span>{{ $t('table.tenant.passwordErrorNum') +'：' }}</span>-->
-    <!--          {{ tenant.passwordErrorNum}}-->
-    <!--        </div>-->
-    <!--      </el-col>-->
-    <!--      <el-col :xs='24' :sm='12'>-->
-    <!--        <div class='view-item'>-->
-    <!--          <i class='el-icon-date' />-->
-    <!--          <span>{{ $t('table.tenant.passwordErrorLockTime') +'：' }}</span>-->
-    <!--          {{ tenant.passwordErrorLockTime | passwordErrorLockTimeFilter }}-->
-    <!--        </div>-->
-    <!--      </el-col>-->
-    <!--    </el-row>-->
-    <el-row :gutter="10">
-      <el-col :xs="24" :sm="24">
-        <div class="view-item">
-          <i class="el-icon-date" />
-          <span>{{ $t('table.tenant.describe') +'：' }}</span>
-          {{ tenant.describe }}
-        </div>
-      </el-col>
-    </el-row>
-  </el-dialog>
-</template>
-<script>
-export default {
-  name: 'TenantView',
-  filters: {
-    passwordErrorLockTimeFilter (time) {
-      if (time === '0') {
-        return '当天23点59分'
-      }
-      return time
-    }
-  },
-  props: {
-    dialogVisible: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data () {
-    return {
-      screenWidth: 0,
-      width: this.initWidth(),
-      tenant: {
-        type: {
-          desc: ''
-        },
-        status: {
-          desc: ''
-        }
-      }
-    }
-  },
-  computed: {
-    isVisible: {
-      get () {
-        return this.dialogVisible
-      },
-      set () {
-        this.close()
-      }
-    }
-  },
-  mounted () {
-    window.onresize = () => {
-      return (() => {
-        this.width = this.initWidth()
-      })()
-    }
-  },
-  methods: {
-    initWidth () {
-      this.screenWidth = document.body.clientWidth
-      if (this.screenWidth < 550) {
-        return '95%'
-      } else if (this.screenWidth < 990) {
-        return '580px'
-      } else if (this.screenWidth < 1400) {
-        return '600px'
-      } else {
-        return '650px'
-      }
-    },
-    setTenant (val) {
-      this.tenant = { ...val }
-    },
-    close () {
-      this.$emit('close')
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.tenant-view {
-  .img-wrapper {
-    text-align: center;
-    margin-top: -1.5rem;
-    margin-bottom: 10px;
-    img {
-      width: 4rem;
-      border-radius: 50%;
-    }
-  }
-  .view-item {
-    margin: 7px;
-    i {
-      font-size: 0.97rem;
-    }
-    span {
-      margin-left: 5px;
-    }
-  }
-}
-</style>
+<template>
+  <el-dialog
+    title="补单信息"
+    width="1200px"
+    :append-to-body="true"
+    :visible.sync="isVisible"
+    class="tenant-view"
+  >
+    <div>
+    	<!-- 列表数据 -->
+	    <el-table
+	      :key="tableKey"
+	      ref="table"
+	      v-loading="loading"
+	      :data="tableData.records"
+	      border
+	      fit
+	      style="width: 100%;"
+	    >
+	    	<!-- 序号 -->
+	    	<el-table-column :label='$t("common.serialNo")' width="55px" align="center">
+		      <template slot-scope="scope">
+		        <div>
+		          {{scope.$index+(queryParams.current - 1) * queryParams.size + 1}}
+		        </div>
+		      </template>
+	      </el-table-column>
+	      <el-table-column prop="furnaceBatchNo" label='产品名称' :show-overflow-tooltip="true" width="150px"></el-table-column>
+	      <el-table-column prop="meterialCode" label='产品唯一码' :show-overflow-tooltip="true" width="200px"></el-table-column>
+		  	<el-table-column prop="factory" label='质检结果' :show-overflow-tooltip="true" width="150px"></el-table-column>
+	      <el-table-column prop="meterialBatchNo" label='数量' :show-overflow-tooltip="true" width="150px"></el-table-column>
+	      <el-table-column prop="factoryDate" label='质检人' :show-overflow-tooltip="true" width="150px"></el-table-column>
+	      <el-table-column prop="batchStand" label='补单单号' :show-overflow-tooltip="true" width="150px"></el-table-column>
+	      <el-table-column prop="createUser" label='所属订单号' :show-overflow-tooltip="true" width="150px"></el-table-column>
+	      <el-table-column prop="createTime" label='所属计划' :show-overflow-tooltip="true" width="150px"></el-table-column>
+	      <el-table-column prop="usedNum" label='生成单据时间' :show-overflow-tooltip="true" width="150px"></el-table-column>
+        <el-table-column prop="lastNum" label='生成人' :show-overflow-tooltip="true" width="150px"></el-table-column>
+        <el-table-column prop="lastNum" label='处理时间' :show-overflow-tooltip="true" width="150px"></el-table-column>
+        <el-table-column prop="lastNum" label='处理人' :show-overflow-tooltip="true" width="150px"></el-table-column>
+	    </el-table>
+
+	    <!-- 分页组件 -->
+	    <pagination
+	      v-show="tableData.total > 0"
+	      :limit.sync="queryParams.size"
+	      :page.sync="queryParams.current"
+	      :total="Number(tableData.total)"
+	      @pagination="fetch"
+	    />
+    </div>
+  </el-dialog>
+</template>
+<script>
+	// 【分页】组件
+	import Pagination from "@/components/Pagination"
+	// 【原材料接收管理】-API
+	import ReceiveApi from "@/api/prepareProductMgr/receive"
+	// 【共通-工具】
+	import { initQueryParams } from '@/utils/commons'
+export default {
+  name: 'TenantView',
+  components: { Pagination },
+  props: {
+    dialogVisible: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+    return {
+      screenWidth: 0,
+      width: this.initWidth(),
+      tenant: {},
+      tableKey: 0,
+      queryParams: initQueryParams({}),
+      selection: [],
+      loading: false,
+      tableData: {
+        total: 0
+      },
+    }
+  },
+  computed: {
+    isVisible: {
+      get () {
+        return this.dialogVisible
+      },
+      set () {
+        this.close()
+      }
+    }
+  },
+  mounted () {
+    window.onresize = () => {
+      return (() => {
+        this.width = this.initWidth()
+      })()
+    }
+  },
+  methods: {
+    initWidth () {
+      this.screenWidth = document.body.clientWidth
+      if (this.screenWidth < 550) {
+        return '95%'
+      } else if (this.screenWidth < 990) {
+        return '580px'
+      } else if (this.screenWidth < 1400) {
+        return '600px'
+      } else {
+        return '650px'
+      }
+    },
+    
+    // 接收来自其他组件的-函数
+    setTenant (val) {
+      this.tenant = { ...val }
+      // 获取列表数据
+			this.fetch();
+    },
+    
+    // 分页列表
+    fetch (params = {}) {
+      this.loading = true
+      if (this.queryParams.timeRange) {
+        this.queryParams.map.createTime_st = this.queryParams.timeRange[0]
+        this.queryParams.map.createTime_ed = this.queryParams.timeRange[1]
+      }
+			//
+      this.queryParams.current = params.current ? params.current : this.queryParams.current
+      this.queryParams.size = params.size ? params.size : this.queryParams.size
+      // 搜索条件添加-材料的id
+      this.queryParams.model.meterialId = this.tenant.id;
+      ReceiveApi.page(this.queryParams).then(response => {
+        const res = response.data
+        if (res.isSuccess) {
+          this.tableData = res.data
+        }
+        // eslint-disable-next-line no-return-assign
+      }).finally(() => this.loading = false)
+
+    },
+    
+    close () {
+      this.$emit('close')
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.tenant-view {
+  .img-wrapper {
+    text-align: center;
+    margin-top: -1.5rem;
+    margin-bottom: 10px;
+    img {
+      width: 4rem;
+      border-radius: 50%;
+    }
+  }
+  .view-item {
+    margin: 7px;
+    i {
+      font-size: 0.97rem;
+    }
+    span {
+      margin-left: 5px;
+    }
+  }
+}
+</style>