Merge branch 'master' of http://106.15.38.8:3000/yaoyq/imcs-yj-fe

imcs-ui/src/api/resourceProductMgr/areaMgr.js

@@ -5,6 +5,10 @@ const apiList = {
     method: 'GET',
     url: `/authority/zZone/all`
   },
+  zoneListExceptBz: {
+    method: 'GET',
+    url: `/authority/zZone/zoneListExceptBz`
+  },
   page: {
     method: 'POST',
     url: `/authority/zZone/page`
@@ -62,6 +66,12 @@ export default {
       data
     })
   },
+  zoneListExceptBz (data) {
+    return axiosApi({
+      ...apiList.zoneListExceptBz,
+      data
+    })
+  },
   page (data) {
     return axiosApi({
       ...apiList.page,

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

@@ -24,7 +24,8 @@ export default {
 			},
 			handleWay: {
 				one: '补单',
-				two: '废品发货'
+				two: '废品发货',
+        three: '返修合格'
 			},
 			handleStatus: {
 				one: '待处理',
@@ -66,15 +67,18 @@ export default {
 			// 质量中心-不合格品管理
 			unQuality: {
 				no: '单据编号',
-				bomName: '产品名称',
-				uniqueCode: '产品唯一码',
+				bomName: '零件名称',
+				uniqueCode: '零件唯一码',
+        procedureNo: '工序号',
+        procedureName: '工序名称',
 				testResult: '质检结果',
 				handleStatus: '处理状态',
 				handleWay: '处理方式',
-				name9: '补单单号',
+				name9: '补单名称',
 				name10: '所属订单号',
 				name11: '所属计划',
 				name12: '不合格生成时间',
+        name13: '所属订单名称',
 				createUserName: '生成人',
 				handleTime: '处理时间',
 				handleUserName: '处理人'
@@ -107,6 +111,7 @@ export default {
       offset: {
         no: '编号',
         orderNo: '订单编号',
+        orderName: '订单名称',
         workpieceName: '零件名称',
         workpieceId: '零件编号',
         procedureName: '工序名称',

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

@@ -249,7 +249,7 @@ export default {
 			// 【托盘管理】列表table字段名称
 			tray: {
 				no: '物料编码',
-				name: '托板名称',
+				name: '托盘名称',
         materialType: '物料类型',
         factory: '生产分厂/制造商',
 

imcs-ui/src/views/zuihou/prepareProductMgr/frockMgr/components/Edit.vue

@@ -250,7 +250,7 @@ export default {
   methods: {
   	// 获取【所属产线】下拉数据
     getZoneList() {
-      areaMgrApi.getList({ status: 1 }).then((res) => {
+      areaMgrApi.zoneListExceptBz({ status: 1 }).then((res) => {
         res = res.data;
         if (res.isSuccess) {
           this.zoneList = res.data;

imcs-ui/src/views/zuihou/prepareProductMgr/material/components/Edit.vue

@@ -1,363 +1,363 @@
-<template>
-  <el-dialog
-  	:close-on-click-modal="false"
-  	:close-on-press-escape="false"
-  	:title="title"
-  	:append-to-body="true"
-  	:visible.sync="isVisible"
-  	:width="width"
-  	top="50px"
-  >
-    <el-form ref="form" :model="tenant" :rules="rules" label-position="right" label-width="130px">
-    	<!--所属产线-->
-      <el-form-item v-if="$store.state.account.user.roles.indexOf('舱体') < 0 && $store.state.account.user.roles.indexOf('框体') < 0" label='所属产线：' prop="zoneId">
-        <el-select
-          v-model="tenant.zoneId"
-           :placeholder='$t("common.pleaseSelect")'
-          style="width: 50%"
-        >
-          <el-option
-            v-for="(item, index) in zoneList"
-            :key="index"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label='物料编码：' prop="meterialCode">
-        <el-input v-model.trim="tenant.meterialCode" :placeholder='$t("common.pleaseEnter")'/>
-      </el-form-item>
-      <!--<el-form-item label='材料牌号：' prop="category" >
-        <el-select style="width:100%" :placeholder='$t("common.pleaseSelect")' v-model="tenant.category.key" value @change="selectCategory($event)">
-          <el-option :key="index" :label="item" :value="key" v-for="(item, key, index) in dicts.METERIAL_CATEGORY" />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label='$t("prepare.table.tools.materialType")+"："' prop="materialType" v-show="materialTypeShowFlag">
-        <el-select style="width:100%" :placeholder='$t("common.pleaseSelect")' v-model="tenant.materialType.key" value>
-          <el-option :key="index" :label="item" :value="key" v-for="(item, key, index) in dicts.MATERIAL_TYPE" />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label='$t("prepare.table.tools.brand")+"："' prop="brand">
-      	<el-select style="width:100%" :placeholder='$t("common.pleaseSelect")' v-model="tenant.brand.key" value>
-          <el-option :key="index" :label="item" :value="key" v-for="(item, key, index) in dicts.METERIAL_BRAND" />
-        </el-select>
-      </el-form-item>-->
-      <el-form-item label='材料牌号：' prop="tradeMark">
-        <el-input v-model.trim="tenant.tradeMark" :placeholder='$t("common.pleaseEnter")'/>
-      </el-form-item>
-      <el-form-item label='器材名称：' prop="equipmentName">
-        <el-input v-model.trim="tenant.equipmentName" :placeholder='$t("common.pleaseEnter")'/>
-      </el-form-item>
-      <el-form-item label='规格型号：' prop="specification">
-        <el-input v-model.trim="tenant.specification" :placeholder='$t("common.pleaseEnter")'/>
-      </el-form-item>      
-      <!--<el-form-item :label='$t("prepare.table.tools.joinDate")+"："' prop="joinDate">        
-        <el-date-picker
-            v-model="tenant.joinDate"
-            type="date"
-            value-format="yyyy-MM-dd"            
-            placeholder="">
-         </el-date-picker>
-      </el-form-item>-->
-      <el-form-item label='处理状态：' prop="handleStatus">
-        <el-input v-model.trim="tenant.handleStatus" :placeholder='$t("common.pleaseEnter")'/>
-      </el-form-item> 
-      <!-- 启用状态 -->
-      <el-form-item :label='$t("prepare.table.tools.status")+"："' prop="status">
-        <template>
-				  <el-radio v-model="tenant.status" label="1">{{$t("common.status.valid")}}</el-radio>
-				  <el-radio v-model="tenant.status" label="0">{{$t("common.frozen")}}</el-radio>
-				</template>
-      </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 MaterialApi from "@/api/prepareProductMgr/material"
-	//【所属产线】-API
-	import areaMgrApi from "@/api/resourceProductMgr/areaMgr"
-	export default {
-	  name: 'TenantEdit',
-	  props: {
-	    dialogVisible: {
-	      type: Boolean,
-	      default: false
-	    },
-	    title: {
-	      type: String,
-	      default: ''
-	    }
-	  },
-	  data () {
-	    return {
-	    	loading: false,
-	      type: 'add',
-	      tableData: [],
-	      zoneList: [],
-	      materialTypeShowFlag: false,
-	      tenant: this.initTenant(),
-	      screenWidth: 0,
-	      width: this.initWidth(),
-	      confirmDisabled: false,
-	      dicts: {
-		      METERIAL_BRAND: {},  //工具材料品牌
-		      METERIAL_CATEGORY: {}, //工具材料分类
-	        MATERIAL_TYPE: {}  //工具材料毛坯成品分类
-		    },
-	      roles: [],
-	      rules: {
-	        meterialCode: [
-	        	{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
-	        ],
-	        tradeMark: [
-	        	{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
-	        ],
-	        specification: [
-	        	{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
-	        ]
-	      }
-	    }
-	  },
-	  // 实例已经在内存中创建好，此时data和methods已将ok,如果要操作data中的数据或是调用methods中的方法，最早只能在created中操作
-	  created() {
-	    // 加载列表数据
-	    this.getZoneList();
-	    // console.log("用户登录的信息：",this.$store.state.account.user.roles.indexOf("舱体") < 0);
-	  },
-	  computed: {
-	    isVisible: {
-	      get () {
-	        return this.dialogVisible
-	      },
-	      set () {
-	        this.close()
-	        this.reset()
-	      }
-	    }
-	  },
-	  mounted () {
-	    window.onresize = () => {
-	      return (() => {
-	        this.width = this.initWidth()
-	      })()
-	    }
-	  },
-	  methods: {
-	  	// 获取【所属产线】下拉数据
-	    getZoneList() {
-	      areaMgrApi.getList({ status: 1 }).then((res) => {
-	        res = res.data;
-	        if (res.isSuccess) {
-	          this.zoneList = res.data;
-	        }
-	      });
-	    },
-    
-	  	// 【新增】按钮-事件
-	    addRes(){
-	      this.tableData.push({
-	      	key: "WKS_"+ Math.random(),
-	      	id: "",
-	      	tradeMark: "",
-	      	specification: "",
-	      	isEdit: true
-	      })
-	    },
-	    // Table的选择事件
-	    onSelectChange (selection) {
-	      this.selection = selection
-	    },
-	    // 【删除】按钮事件
-	    singleDelete(row){
-	    	this.$confirm("删除数据后，将会消失，您的努力将白费，请确认删除？", this.$t("common.tips"), {
-	      	distinguishCancelAndClose: true,
-	        confirmButtonText: "确认",
-	        cancelButtonText: "取消",
-	        type: "warning"
-	      }).then(() => {
-	      	// 过滤符合条件的数据
-	      	let arr = this.tableData.filter(item => item.key != row.key || item.id != row.id)
-	      	// 给新的数据赋值
-	    		this.tableData = arr;
-	      }).catch(() => {})
-	    },
-	    // 【修改】按钮事件
-	    edit(row){
-	    	let list = new Array();
-	    	this.tableData.forEach((item, index) => {
-	    		// 当前编辑行
-	    		if(!!item.id && item.id == row.id){
-	    			item.isEdit = true
-	    		}
-	    		list.push(item)
-	    	})
-	    	// 赋值给当前
-	    	this.tableData = list
-	    },
-	    initTenant () {
-	      return {
-	      	userId: this.$store.state.account.user.id,  // 默认添加登录用户ID
-	      	meterialCode: '',
-	        tradeMark: '',
-	        equipmentName: '',
-	        specification: '',
-	        handleStatus: '',
-	        status: '1'
-	      }
-	    },
-	
-	    selectCategory(id){
-	      if("04" === id){
-	          this.materialTypeShowFlag = true;
-	      }else{
-	          this.materialTypeShowFlag = false;
-	      }
-	    },
-	    
-	    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) {
-	    	if(val){
-	    		this.tenant = { ...val }
-	    		/*if("04" === this.tenant.category.key){
-	            this.materialTypeShowFlag = true;
-	        }else{
-	            this.materialTypeShowFlag = false;
-	        }*/
-	    		// 根据id,查询规格列表数据
-	    		// this.getSpecsList(val)
-	    	}
-	      // 字典表
-	      this.dicts = dicts
-	    },
-	    close () {
-	      this.$emit('close')
-	    },
-	    reset () {
-	      // 先清除校验，再清除表单，不然有奇怪的bug
-	      this.$refs.form.clearValidate()
-	      this.$refs.form.resetFields()
-	      this.tenant = this.initTenant()
-	      this.tableData = []  	//清空【规格】数据
-	    },
-	    submitForm () {
-	    	//console.log("Form数据：", this.tenant)
-	      this.$refs.form.validate((valid) => {
-	        if (valid) {
-	          this.confirmDisabled = true
-	          if (this.type === 'add') {
-	            this.save()
-	          } else {
-	            this.update()
-	          }
-	        } else {
-	          return false
-	        }
-	      })
-	    },
-	    
-	    save () {
-	      console.log(this.tenant)
-	      MaterialApi.save(this.tenant)
-	        .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
-	        })
-	    },
-	    update () {
-	      MaterialApi.update(this.tenant)
-	        .then((response) => {
-	          const res = response.data
-	          if (res.isSuccess) {
-	            this.isVisible = false
-	            this.$message({
-	              message: this.$t('tips.updateSuccess'),
-	              type: 'success'
-	            })
-	            // 通知列表
-		          this.$emit("success");
-		          // 通知列表-并关闭弹出框
-		          this.$emit("close");
-	          }
-	        }).finally(() => {
-	          this.confirmDisabled = false
-	          return true
-	        })
-	    },
-	    // 根据【工具原材料】的id，查询，规格列表数据
-	    getSpecsList(row){
-	    	/*let obj = {
-	    		current: 1,
-	    		size: 1000,
-	    		model: {
-	    			meterialId: row.id
-	    		}
-	    	}*/
-	    	MaterialApi.listSpecs({meterialId: row.id}).then(res => {
-	    		res = res.data
-	    		console.log("规格数据：", res)
-	    		if(res.isSuccess){
-	    			this.tableData = res.data
-	    		}
-	    	})
-	    }
-	  }
-	}
-</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;
-}
-</style>
+<template>
+  <el-dialog
+  	:close-on-click-modal="false"
+  	:close-on-press-escape="false"
+  	:title="title"
+  	:append-to-body="true"
+  	:visible.sync="isVisible"
+  	:width="width"
+  	top="50px"
+  >
+    <el-form ref="form" :model="tenant" :rules="rules" label-position="right" label-width="130px">
+    	<!--所属产线-->
+      <el-form-item v-if="$store.state.account.user.roles.indexOf('舱体') < 0 && $store.state.account.user.roles.indexOf('框体') < 0" label='所属产线：' prop="zoneId">
+        <el-select
+          v-model="tenant.zoneId"
+           :placeholder='$t("common.pleaseSelect")'
+          style="width: 50%"
+        >
+          <el-option
+            v-for="(item, index) in zoneList"
+            :key="index"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label='物料编码：' prop="meterialCode">
+        <el-input v-model.trim="tenant.meterialCode" :placeholder='$t("common.pleaseEnter")'/>
+      </el-form-item>
+      <!--<el-form-item label='材料牌号：' prop="category" >
+        <el-select style="width:100%" :placeholder='$t("common.pleaseSelect")' v-model="tenant.category.key" value @change="selectCategory($event)">
+          <el-option :key="index" :label="item" :value="key" v-for="(item, key, index) in dicts.METERIAL_CATEGORY" />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label='$t("prepare.table.tools.materialType")+"："' prop="materialType" v-show="materialTypeShowFlag">
+        <el-select style="width:100%" :placeholder='$t("common.pleaseSelect")' v-model="tenant.materialType.key" value>
+          <el-option :key="index" :label="item" :value="key" v-for="(item, key, index) in dicts.MATERIAL_TYPE" />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label='$t("prepare.table.tools.brand")+"："' prop="brand">
+      	<el-select style="width:100%" :placeholder='$t("common.pleaseSelect")' v-model="tenant.brand.key" value>
+          <el-option :key="index" :label="item" :value="key" v-for="(item, key, index) in dicts.METERIAL_BRAND" />
+        </el-select>
+      </el-form-item>-->
+      <el-form-item label='材料牌号：' prop="tradeMark">
+        <el-input v-model.trim="tenant.tradeMark" :placeholder='$t("common.pleaseEnter")'/>
+      </el-form-item>
+      <el-form-item label='器材名称：' prop="equipmentName">
+        <el-input v-model.trim="tenant.equipmentName" :placeholder='$t("common.pleaseEnter")'/>
+      </el-form-item>
+      <el-form-item label='规格型号：' prop="specification">
+        <el-input v-model.trim="tenant.specification" :placeholder='$t("common.pleaseEnter")'/>
+      </el-form-item>
+      <!--<el-form-item :label='$t("prepare.table.tools.joinDate")+"："' prop="joinDate">
+        <el-date-picker
+            v-model="tenant.joinDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="">
+         </el-date-picker>
+      </el-form-item>-->
+      <el-form-item label='处理状态：' prop="handleStatus">
+        <el-input v-model.trim="tenant.handleStatus" :placeholder='$t("common.pleaseEnter")'/>
+      </el-form-item>
+      <!-- 启用状态 -->
+      <el-form-item :label='$t("prepare.table.tools.status")+"："' prop="status">
+        <template>
+				  <el-radio v-model="tenant.status" label="1">{{$t("common.status.valid")}}</el-radio>
+				  <el-radio v-model="tenant.status" label="0">{{$t("common.frozen")}}</el-radio>
+				</template>
+      </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 MaterialApi from "@/api/prepareProductMgr/material"
+	//【所属产线】-API
+	import areaMgrApi from "@/api/resourceProductMgr/areaMgr"
+	export default {
+	  name: 'TenantEdit',
+	  props: {
+	    dialogVisible: {
+	      type: Boolean,
+	      default: false
+	    },
+	    title: {
+	      type: String,
+	      default: ''
+	    }
+	  },
+	  data () {
+	    return {
+	    	loading: false,
+	      type: 'add',
+	      tableData: [],
+	      zoneList: [],
+	      materialTypeShowFlag: false,
+	      tenant: this.initTenant(),
+	      screenWidth: 0,
+	      width: this.initWidth(),
+	      confirmDisabled: false,
+	      dicts: {
+		      METERIAL_BRAND: {},  //工具材料品牌
+		      METERIAL_CATEGORY: {}, //工具材料分类
+	        MATERIAL_TYPE: {}  //工具材料毛坯成品分类
+		    },
+	      roles: [],
+	      rules: {
+	        meterialCode: [
+	        	{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
+	        ],
+	        tradeMark: [
+	        	{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
+	        ],
+	        specification: [
+	        	{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
+	        ]
+	      }
+	    }
+	  },
+	  // 实例已经在内存中创建好，此时data和methods已将ok,如果要操作data中的数据或是调用methods中的方法，最早只能在created中操作
+	  created() {
+	    // 加载列表数据
+	    this.getZoneList();
+	    // console.log("用户登录的信息：",this.$store.state.account.user.roles.indexOf("舱体") < 0);
+	  },
+	  computed: {
+	    isVisible: {
+	      get () {
+	        return this.dialogVisible
+	      },
+	      set () {
+	        this.close()
+	        this.reset()
+	      }
+	    }
+	  },
+	  mounted () {
+	    window.onresize = () => {
+	      return (() => {
+	        this.width = this.initWidth()
+	      })()
+	    }
+	  },
+	  methods: {
+	  	// 获取【所属产线】下拉数据
+	    getZoneList() {
+	      areaMgrApi.zoneListExceptBz({ status: 1 }).then((res) => {
+	        res = res.data;
+	        if (res.isSuccess) {
+	          this.zoneList = res.data;
+	        }
+	      });
+	    },
+
+	  	// 【新增】按钮-事件
+	    addRes(){
+	      this.tableData.push({
+	      	key: "WKS_"+ Math.random(),
+	      	id: "",
+	      	tradeMark: "",
+	      	specification: "",
+	      	isEdit: true
+	      })
+	    },
+	    // Table的选择事件
+	    onSelectChange (selection) {
+	      this.selection = selection
+	    },
+	    // 【删除】按钮事件
+	    singleDelete(row){
+	    	this.$confirm("删除数据后，将会消失，您的努力将白费，请确认删除？", this.$t("common.tips"), {
+	      	distinguishCancelAndClose: true,
+	        confirmButtonText: "确认",
+	        cancelButtonText: "取消",
+	        type: "warning"
+	      }).then(() => {
+	      	// 过滤符合条件的数据
+	      	let arr = this.tableData.filter(item => item.key != row.key || item.id != row.id)
+	      	// 给新的数据赋值
+	    		this.tableData = arr;
+	      }).catch(() => {})
+	    },
+	    // 【修改】按钮事件
+	    edit(row){
+	    	let list = new Array();
+	    	this.tableData.forEach((item, index) => {
+	    		// 当前编辑行
+	    		if(!!item.id && item.id == row.id){
+	    			item.isEdit = true
+	    		}
+	    		list.push(item)
+	    	})
+	    	// 赋值给当前
+	    	this.tableData = list
+	    },
+	    initTenant () {
+	      return {
+	      	userId: this.$store.state.account.user.id,  // 默认添加登录用户ID
+	      	meterialCode: '',
+	        tradeMark: '',
+	        equipmentName: '',
+	        specification: '',
+	        handleStatus: '',
+	        status: '1'
+	      }
+	    },
+
+	    selectCategory(id){
+	      if("04" === id){
+	          this.materialTypeShowFlag = true;
+	      }else{
+	          this.materialTypeShowFlag = false;
+	      }
+	    },
+
+	    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) {
+	    	if(val){
+	    		this.tenant = { ...val }
+	    		/*if("04" === this.tenant.category.key){
+	            this.materialTypeShowFlag = true;
+	        }else{
+	            this.materialTypeShowFlag = false;
+	        }*/
+	    		// 根据id,查询规格列表数据
+	    		// this.getSpecsList(val)
+	    	}
+	      // 字典表
+	      this.dicts = dicts
+	    },
+	    close () {
+	      this.$emit('close')
+	    },
+	    reset () {
+	      // 先清除校验，再清除表单，不然有奇怪的bug
+	      this.$refs.form.clearValidate()
+	      this.$refs.form.resetFields()
+	      this.tenant = this.initTenant()
+	      this.tableData = []  	//清空【规格】数据
+	    },
+	    submitForm () {
+	    	//console.log("Form数据：", this.tenant)
+	      this.$refs.form.validate((valid) => {
+	        if (valid) {
+	          this.confirmDisabled = true
+	          if (this.type === 'add') {
+	            this.save()
+	          } else {
+	            this.update()
+	          }
+	        } else {
+	          return false
+	        }
+	      })
+	    },
+
+	    save () {
+	      console.log(this.tenant)
+	      MaterialApi.save(this.tenant)
+	        .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
+	        })
+	    },
+	    update () {
+	      MaterialApi.update(this.tenant)
+	        .then((response) => {
+	          const res = response.data
+	          if (res.isSuccess) {
+	            this.isVisible = false
+	            this.$message({
+	              message: this.$t('tips.updateSuccess'),
+	              type: 'success'
+	            })
+	            // 通知列表
+		          this.$emit("success");
+		          // 通知列表-并关闭弹出框
+		          this.$emit("close");
+	          }
+	        }).finally(() => {
+	          this.confirmDisabled = false
+	          return true
+	        })
+	    },
+	    // 根据【工具原材料】的id，查询，规格列表数据
+	    getSpecsList(row){
+	    	/*let obj = {
+	    		current: 1,
+	    		size: 1000,
+	    		model: {
+	    			meterialId: row.id
+	    		}
+	    	}*/
+	    	MaterialApi.listSpecs({meterialId: row.id}).then(res => {
+	    		res = res.data
+	    		console.log("规格数据：", res)
+	    		if(res.isSuccess){
+	    			this.tableData = res.data
+	    		}
+	    	})
+	    }
+	  }
+	}
+</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;
+}
+</style>

imcs-ui/src/views/zuihou/prepareProductMgr/trayMgr/components/Edit.vue

@@ -1,349 +1,3 @@
-<<<<<<< HEAD
-<template>
-  <el-dialog
-  	:close-on-click-modal="false"
-  	:close-on-press-escape="false"
-  	:title="title"
-  	:append-to-body="true"
-  	:visible.sync="isVisible"
-  	:width="width"
-  	top="50px"
-  >
-    <el-form ref="form" :model="tenant" :rules="rules" label-position="right" label-width="130px">
-    	<!--所属产线-->
-      <!--<el-form-item v-if="$store.state.account.user.roles.indexOf('舱体') < 0 && $store.state.account.user.roles.indexOf('框体') < 0" label='所属产线：' prop="zoneId">
-        <el-select
-          v-model="tenant.zoneId"
-           :placeholder='$t("common.pleaseSelect")'
-          style="width: 50%"
-        >
-          <el-option
-            v-for="(item, index) in zoneList"
-            :key="index"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>-->
-      <!--编码-->
-      <el-form-item :label='$t("prepare.table.tray.no")+"："' prop="no">
-        <el-input v-model="tenant.no" :placeholder='$t("common.pleaseEnter")'/>
-      </el-form-item>
-      <!--名称-->
-      <el-form-item :label='$t("prepare.table.tray.name")+"："' prop="name">
-        <el-input v-model="tenant.name" :placeholder='$t("common.pleaseEnter")'/>
-      </el-form-item>
-      <!--物料类型-->
-      <el-form-item :label='$t("prepare.table.tray.materialType")+"："' prop="materialType">
-        <el-input v-model="tenant.materialType" :placeholder='$t("common.pleaseEnter")'/>
-      </el-form-item>
-<!--      &lt;!&ndash;品牌&ndash;&gt;-->
-<!--    	<el-form-item :label='$t("prepare.table.tray.brand")+"："' prop="brand">-->
-<!--      	<el-select style="width:100%" :placeholder='$t("common.pleaseSelect")' v-model="tenant.brand.key" value>-->
-<!--          <el-option :key="index" :label="item" :value="key" v-for="(item, key, index) in dicts.METERIAL_BRAND" />-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
-      <!--生产分厂/制造商-->
-      <el-form-item :label='$t("prepare.table.tray.factory")+"："' prop="factory">
-        <el-input v-model="tenant.factory" :placeholder='$t("common.pleaseEnter")'/>
-      </el-form-item>
-
-      <el-form-item :label='$t("prepare.table.tray.joinDate")+"："' prop="joinDate">
-        <el-date-picker
-          v-model="tenant.joinDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item :label='$t("prepare.table.tray.period")+"："' prop="period">
-        <el-input-number v-model="tenant.period" :min="1" :max="1000" label="12"></el-input-number>&nbsp;&nbsp;月
-      </el-form-item>
-      <el-form-item :label="$t('prepare.table.tray.expiryDate')+'：'" prop="expiryDate">
-        <el-input-number v-model="tenant.expiryDate" :min="1" :max="1000" label="12"></el-input-number>&nbsp;&nbsp;月
-      </el-form-item>
-      <el-form-item :label='$t("prepare.table.tray.num")+"："' prop="num">
-        <el-input-number v-model="tenant.num" :min="1" :max="1000" label="1"></el-input-number>&nbsp;&nbsp;个
-      </el-form-item>
-      <el-form-item :label='$t("prepare.table.tools.status")+"："' prop="status">
-        <template>
-				  <el-radio v-model="tenant.status" label="1">{{$t("common.status.valid")}}</el-radio>
-				  <el-radio v-model="tenant.status" label="0">{{$t("common.frozen")}}</el-radio>
-				</template>
-      </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 trayMgrApi from "@/api/prepareProductMgr/trayMgr"
-//【所属产线】-API
-import areaMgrApi from "@/api/resourceProductMgr/areaMgr"
-export default {
-  name: 'TenantEdit',
-  props: {
-    dialogVisible: {
-      type: Boolean,
-      default: false
-    },
-    title: {
-      type: String,
-      default: ''
-    }
-  },
-  data () {
-    return {
-    	loading: false,
-      type: 'add',
-      zoneList: [],
-      tableData: [],
-      tenant: this.initTenant(),
-      screenWidth: 0,
-      width: this.initWidth(),
-      confirmDisabled: false,
-      dicts: {
-	      METERIAL_BRAND: {} //工具材料品牌
-	    },
-      roles: [],
-      rules: {
-        name: [
-        	{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  // 实例已经在内存中创建好，此时data和methods已将ok,如果要操作data中的数据或是调用methods中的方法，最早只能在created中操作
-  created() {
-    // 加载列表数据
-    // this.getZoneList();
-  },
-  computed: {
-    isVisible: {
-      get () {
-        return this.dialogVisible
-      },
-      set () {
-        this.close()
-        this.reset()
-      }
-    }
-  },
-  mounted () {
-    window.onresize = () => {
-      return (() => {
-        this.width = this.initWidth()
-      })()
-    }
-  },
-  methods: {
-  	// 【新增】按钮-事件
-    addRes(){
-      this.tableData.push({
-      	key: "WKS_"+ Math.random(),
-      	id: '',
-      	positionSort: this.tableData.length + 1,
-      	size: '',
-      	remark: '',
-      	isEdit: true
-      })
-    },
-    
-    // 获取【所属产线】下拉数据
-    getZoneList() {
-      areaMgrApi.getList({ status: 1 }).then((res) => {
-        res = res.data;
-        if (res.isSuccess) {
-          this.zoneList = res.data;
-        }
-      });
-    },
-    
-    // Table的选择事件
-    onSelectChange (selection) {
-      this.selection = selection
-    },
-    // 【删除】按钮事件
-    singleDelete(row){
-    	this.$confirm(this.$t("tips.comTips"), this.$t("common.tips"), {
-      	distinguishCancelAndClose: true,
-        confirmButtonText: this.$t("common.confirm"),
-        cancelButtonText: this.$t("common.cancel"),
-        type: "warning"
-      }).then(() => {
-      	// 过滤符合条件的数据
-      	let arr = this.tableData.filter(item => item.key != row.key || item.id != row.id)
-      	// 给数据排序
-    		arr.forEach((item, index) => {
-    			item.positionSort = index + 1
-    		})
-      	// 给新的数据赋值
-    		this.tableData = arr;
-
-      }).catch(() => {})
-    },
-    // 【修改】按钮事件
-    edit(row){
-    	let list = new Array();
-    	this.tableData.forEach((item, index) => {
-    		// 当前编辑行
-    		if(!!item.id && item.id == row.id){
-    			item.isEdit = true
-    		}
-    		list.push(item)
-    	})
-    	// 赋值给当前
-    	this.tableData = list
-    },
-    initTenant () {
-      return {
-      	userId: this.$store.state.account.user.id,  // 默认添加登录用户ID
-      	model: '',
-        name: '',
-        zoneId: '',
-        category: {
-          key: ''
-        },
-        brand: {
-          key: ''
-        },
-        status: '1',
-        num: '1'
-      }
-    },
-    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) {
-    	if(val){
-    		this.tenant = { ...val }
-    		// 根据id,查询规格列表数据
-    		this.getSpecsList(val)
-    	}
-      // 字典表
-      this.dicts = dicts
-    },
-    close () {
-      this.$emit('close')
-    },
-    reset () {
-      // 先清除校验，再清除表单，不然有奇怪的bug
-      this.$refs.form.clearValidate()
-      this.$refs.form.resetFields()
-      this.tenant = this.initTenant()
-      this.tableData = []  	//清空【规格】数据
-    },
-    submitForm () {
-    	// 添加夹紧位置数据
-    	this.tenant.trayPositionList = this.tableData
-    	//console.log("Form数据：", this.tenant)
-      this.$refs.form.validate((valid) => {
-        if (valid) {
-          this.confirmDisabled = true
-          if (this.type === 'add') {
-            this.save()
-          } else {
-            this.update()
-          }
-        } else {
-          return false
-        }
-      })
-    },
-    save () {
-      trayMgrApi.save(this.tenant)
-        .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
-        })
-    },
-    update () {
-      trayMgrApi.update(this.tenant)
-        .then((response) => {
-          const res = response.data
-          if (res.isSuccess) {
-            this.isVisible = false
-            this.$message({
-              message: this.$t('tips.updateSuccess'),
-              type: 'success'
-            })
-            // 通知列表
-	          this.$emit("success");
-	          // 通知列表-并关闭弹出框
-	          this.$emit("close");
-          }
-        }).finally(() => {
-          this.confirmDisabled = false
-          return true
-        })
-    },
-    // 根据【托盘】的id，查询，夹紧位置列表数据
-    getSpecsList(row){
-    	trayMgrApi.listSpecs(row).then(res => {
-    		res = res.data
-    		// console.log("夹紧位置数据：", res)
-    		if(res.isSuccess){
-    			this.tableData = res.data
-    		}
-    	})
-    }
-  }
-}
-</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;
-}
-</style>
-=======
 <template>
   <el-dialog
   	:close-on-click-modal="false"
@@ -356,20 +10,20 @@ export default {
   >
     <el-form ref="form" :model="tenant" :rules="rules" label-position="right" label-width="130px">
     	<!--所属产线-->
-<!--      <el-form-item v-if="$store.state.account.user.roles.indexOf('舱体') < 0 || $store.state.account.user.roles.indexOf('框体') < 0" label='所属产线：' prop="zoneId">-->
-<!--        <el-select-->
-<!--          v-model="tenant.zoneId"-->
-<!--           :placeholder='$t("common.pleaseSelect")'-->
-<!--          style="width: 50%"-->
-<!--        >-->
-<!--          <el-option-->
-<!--            v-for="(item, index) in zoneList"-->
-<!--            :key="index"-->
-<!--            :label="item.name"-->
-<!--            :value="item.id"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
+      <el-form-item v-if="$store.state.account.user.roles.indexOf('舱体') < 0 || $store.state.account.user.roles.indexOf('框体') < 0" label='所属产线：' prop="zoneId">
+        <el-select
+          v-model="tenant.zoneId"
+           :placeholder='$t("common.pleaseSelect")'
+          style="width: 50%"
+        >
+          <el-option
+            v-for="(item, index) in zoneList"
+            :key="index"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
       <!--编码-->
       <el-form-item :label='$t("prepare.table.tray.no")+"："' prop="no">
         <el-input v-model="tenant.no" :placeholder='$t("common.pleaseEnter")'/>
@@ -499,7 +153,7 @@ export default {
 
     // 获取【所属产线】下拉数据
     getZoneList() {
-      areaMgrApi.getList({ status: 1 }).then((res) => {
+      areaMgrApi.zoneListExceptBz({ status: 1 }).then((res) => {
         res = res.data;
         if (res.isSuccess) {
           this.zoneList = res.data;

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

@@ -58,6 +58,8 @@
       </el-table-column>
 	    <!-- 订单编号 -->
       <el-table-column prop="orderNo" :label='$t("machining.table.offset.orderNo")' :show-overflow-tooltip="true"></el-table-column>
+
+      <el-table-column prop="orderName" :label='$t("machining.table.offset.orderName")' :show-overflow-tooltip="true"></el-table-column>
       <!-- '零件名称 -->
       <el-table-column prop="workpieceName" :label='$t("machining.table.offset.workpieceName")' :show-overflow-tooltip="true"></el-table-column>
       <!-- 零件编号 -->

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

@@ -1,394 +1,400 @@
-<template>
-  <div class="app-container">
-		<!-- 搜索模块 -->
-    <div class="filter-container">
-    	<span>
-    		<span>{{$t("lineSide.searchForm.status")}}：</span>
-    		<el-select v-model="queryParams.model.handleStatus" :placeholder='$t("common.pleaseSelect")' size="medium" style="width: 150px;">
-        	<el-option
-			      v-for="item in audioStatus"
-			      :key="item.value"
-			      :label="item.label"
-			      :value="item.value">
-			    </el-option>
-      	</el-select>
-    	</span>
-    	<span style="margin-left: 15px;">
-    		<span>{{$t("machining.table.unQuality.uniqueCode")}}：</span>
-    		<el-input v-model="queryParams.model.uniqueCode" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
-    	</span>
-    	<span style="margin-left: 15px;">
-    		<span>订单名称：</span>
-    		<el-input v-model="queryParams.model.orderName" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
-    	</span>
-    	<span style="margin-left: 15px;">
-    		<span>零件名称：</span>
-    		<el-input v-model="queryParams.model.bomName" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
-    	</span>
-      <span style="margin-left: 15px;">
-	      <el-button plain type="primary" icon="el-icon-search" size="medium" @click="search">
-	        {{ $t("table.search") }}
-	      </el-button>
-	      <el-button plain type="warning" icon="el-icon-refresh" size="medium" @click="reset">
-	        {{ $t("table.reset") }}
-	      </el-button>
-      </span>
-    </div>
-
-    <!-- 功能按钮 -->
-    <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="['unqualified:tags']" type="primary" icon="el-icon-edit" size="medium" @click="editOne">
-	        {{ $t("machining.common.marking") }}
-	      </el-button>
-	      <el-button v-has-permission="['unqualified:delete']" type="danger" icon="el-icon-delete" size="medium" @click="batchDelete">
-	        {{ $t("table.delete") }}
-	      </el-button>
-    	</el-col>
-    </el-row>
-
-		<!-- 列表数据 -->
-    <el-table
-      :key="tableKey"
-      ref="table"
-      v-loading="loading"
-      :data="tableData.records"
-      border
-      fit
-      row-key="id"
-      style="width: 100%;"
-      @selection-change="onSelectChange"
-      @cell-click="cellClick"
-    >
-    	<!-- 序号 -->
-    	<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 align="center" type="selection" width="50" :reserve-selection="true" />
-      <!-- 单据编号 -->
-      <el-table-column prop="no" :label='$t("machining.table.unQuality.no")' :show-overflow-tooltip="true"></el-table-column>
-      <!-- 产品名称 -->
-      <el-table-column prop="bomName" :label='$t("machining.table.unQuality.bomName")' :show-overflow-tooltip="true"></el-table-column>
-      <!-- 产品唯一码 -->
-      <el-table-column prop="uniqueCode" :label='$t("machining.table.unQuality.uniqueCode")' width="100" :show-overflow-tooltip="true"></el-table-column>
-      <!-- 所属订单号 -->
-      <el-table-column prop="orderNo" :label='$t("machining.table.unQuality.name10")' width="100" :show-overflow-tooltip="true"></el-table-column>
-      <!-- 生成单据时间 -->
-      <el-table-column prop="createTime" :label='$t("machining.table.unQuality.name12")' width="150" :show-overflow-tooltip="true"></el-table-column>
-      <!-- 所属计划
-      <el-table-column prop="planNo" :label='$t("machining.table.unQuality.name11")' :show-overflow-tooltip="true"></el-table-column>-->
-      <!-- 质检结果 -->
-<!--      <el-table-column prop="testResult" :label='$t("machining.table.unQuality.testResult")' :show-overflow-tooltip="true">-->
-<!--      	<template slot-scope="{ row }">-->
-<!--	      	<el-tag v-if="row.testResult == '1'">{{$t("machining.common.testResult.one")}}</el-tag>-->
-<!--					<el-tag v-if="row.testResult == '0'" type="success">{{$t("machining.common.testResult.two")}}</el-tag>-->
-<!--				</template>-->
-<!--      </el-table-column>-->
-<!--      &lt;!&ndash; 数量 &ndash;&gt;-->
-<!--      <el-table-column prop="bomNum" :label='$t("machining.table.unQuality.bomNum")' :show-overflow-tooltip="true"></el-table-column>-->
-<!--      &lt;!&ndash; 质检人 &ndash;&gt;-->
-<!--      <el-table-column prop="handleUserName" :label='$t("machining.table.unQuality.handleUserName")' :show-overflow-tooltip="true"></el-table-column>-->
-      <!-- 处理状态 -->
-      <el-table-column prop="handleStatus" :label='$t("machining.table.unQuality.handleStatus")' align="center" width="90px">
-      	<template slot-scope="{ row }">
-	      	<el-tag v-if="row.handleStatus == '1'">{{$t("machining.common.handleStatus.one")}}</el-tag>
-					<el-tag v-if="row.handleStatus == '2'" type="success">{{$t("machining.common.handleStatus.two")}}</el-tag>
-				</template>
-      </el-table-column>
-      <!-- 处理方式 -->
-      <el-table-column prop="handleWay" :label='$t("machining.table.unQuality.handleWay")' align="center" width="90px">
-      	<template slot-scope="{ row }">
-	      	<el-tag v-if="row.handleWay == '1'">{{$t("machining.common.handleWay.one")}}</el-tag>
-					<el-tag v-if="row.handleWay == '2'" type="success">{{$t("machining.common.handleWay.two")}}</el-tag>
-				</template>
-      </el-table-column>
-      <!-- 补单单号 -->
-      <el-table-column prop="addOrderNo" :label='$t("machining.table.unQuality.name9")' :show-overflow-tooltip="true"></el-table-column>
-
-      <!-- 生成人 -->
-<!--      <el-table-column prop="createUserName" :label='$t("machining.table.unQuality.createUserName")' :show-overflow-tooltip="true"></el-table-column>-->
-      <!-- 处理时间 -->
-      <el-table-column prop="handleTime" :label='$t("machining.table.unQuality.handleTime")' width="180px"></el-table-column>
-      <!-- 处理人 -->
-      <el-table-column prop="handleUserName" :label='$t("machining.table.unQuality.handleUserName")' width="180px"></el-table-column>
-      <!-- 操作 -->
-      <el-table-column
-        :label="$t('table.operation')"
-        fixed="right"
-        align="center"
-        column-key="operation"
-        width="60px"
-      >
-        <template slot-scope="{ row }">
-        	<!--<el-tooltip class="item" content="查看详情" effect="dark" placement="top-start">
-	          <i
-	            class="el-icon-view table-operation"
-	            style="color: #87d068;"
-	            @click="view(row)"
-	          />
-          </el-tooltip>-->
-          <!--<el-tooltip class="item" :content='$t("common.edit")' effect="dark" placement="top-start">
-	          <i
-	            class="el-icon-edit table-operation"
-	            style="color: #2db7f5;"
-	            @click="edit(row)"
-	          />
-          </el-tooltip>-->
-          <el-tooltip class="item" :content='$t("common.delete")' effect="dark" placement="top-start">
-	          <i
-	            class="el-icon-delete table-operation"
-	            style="color: #f50;"
-	            @click="singleDelete(row)"
-	          />
-          </el-tooltip>
-        </template>
-      </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"
-    />
-    <tenant-edit
-      ref="edit"
-      :dialog-visible="dialog.isVisible"
-      :title="dialog.title"
-      @close="editClose"
-      @success="editSuccess"
-    />
-    <tenant-view
-      ref="view"
-      :dialog-visible="tenantViewVisible"
-      @close="viewClose"
-    />
-    <el-dialog
-      v-el-drag-dialog
-      :close-on-click-modal="false"
-      :close-on-press-escape="true"
-      title="预览"
-      width="80%"
-      top="50px"
-      :visible.sync="preview.isVisible"
-    >
-      <el-scrollbar>
-        <div v-html="preview.context" />
-      </el-scrollbar>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-	// 【分页】组件
-	import Pagination from "@/components/Pagination"
-	// 【新增/修改】组件
-	import TenantEdit from "./components/Edit"
-	// 【查看】组件
-	import TenantView from "./components/View"
-	// 【不合格产品管理】-API
-	import unqualifiedMgrApi from "@/api/machiningClient/unqualifiedMgr"
-	// 【弹出框】elementui组件
-	import elDragDialog from '@/directive/el-drag-dialog'
-	// 共通函数
-	import { downloadFile, initEnums, initDicts, initQueryParams } from '@/utils/commons'
-
-	export default {
-	  name: "UnqualifiedMgr",
-	  directives: { elDragDialog },
-	  components: { Pagination, TenantEdit, TenantView },
-	  props: {
-	  },
-	  data () {
-	    return {
-	    	audioStatus: [],
-	      dialog: {
-	        isVisible: false,
-	        title: ""
-	      },
-	      preview: {
-	        isVisible: false,
-	        context: ''
-	      },
-	      tenantViewVisible: false,
-	      tableKey: 0,
-	      queryParams: initQueryParams({}),
-	      selection: [],
-	      loading: false,
-	      tableData: {
-	        total: 0
-	      },
-	      dicts: {
-          NATION: {}
-        },
-	      enums: {
-	        TenantTypeEnum: {},
-	        TenantStatusEnum: {}
-	      }
-	    }
-	  },
-	  // 实例已经在内存中创建好，此时data和methods已将ok,如果要操作data中的数据或是调用methods中的方法，最早只能在created中操作
-	  created() {
-	  	// 调用常量-审核状态
-	  	this.audioStatus = this.$constWKS.WAITINGLIST
-	  	// 加载【字典】
-	  	initDicts(['NATION'], this.dicts);
-	  	// 加载列表数据
-	  	this.fetch()
-		},
-	  computed: {
-	    currentUser () {
-	      return this.$store.state.account.user
-	    },
-	    nationList() {
-        return convertEnum(this.dicts.NATION)
-      }
-	  },
-	  mounted () {
-
-	  },
-	  methods: {
-	    viewClose () {
-	      this.tenantViewVisible = false
-	    },
-	    editClose () {
-	      this.dialog.isVisible = false
-	    },
-	    editSuccess () {
-	      this.search()
-	    },
-	    onSelectChange (selection) {
-	      this.selection = selection
-	    },
-	    search () {
-	      this.fetch({
-	        ...this.queryParams
-	      })
-	    },
-	    reset () {
-	      this.queryParams = initQueryParams({})
-	      this.$refs.table.clearSort()
-	      this.$refs.table.clearFilter()
-	      this.search()
-	    },
-	    add () {
-	      this.$refs.edit.type = "add"
-	      this.dialog.title = this.$t("machining.common.marking")
-	      this.dialog.isVisible = true
-	    },
-	    singleDelete (row) {
-	      this.$refs.table.clearSelection()
-	      this.$refs.table.toggleRowSelection(row, true)
-	      this.batchDelete()
-	    },
-	    batchDelete () {
-	      if (!this.selection.length) {
-	        this.$message({
-	          message: this.$t("tips.noDataSelected"),
-	          type: "warning"
-	        })
-	        return
-	      }
-
-	      this.$confirm(this.$t("lineSide.tips.wareTips"), this.$t("common.tips"), {
-	      	distinguishCancelAndClose: true,
-	        confirmButtonText: this.$t("common.confirm"),
-	        cancelButtonText: this.$t("common.cancel"),
-	        type: "warning"
-	      }).then(() => {
-	      	const ids = []
-		      this.selection.forEach(item => {
-		        ids.push(item.id)
-		      })
-		      this.delete(ids)
-	      }).catch(() => {})
-	    },
-	    clearSelections () {
-	      this.$refs.table.clearSelection()
-	    },
-	    delete (ids) {
-	      unqualifiedMgrApi.remove({ ids: ids }).then(response => {
-	        const res = response.data
-	        if (res.isSuccess) {
-	          this.$message({
-	            message: this.$t("tips.deleteSuccess"),
-	            type: "success"
-	          })
-	          this.search()
-	          // 清理已经删除的数据
-	          this.$refs.table.clearSelection()
-	        }
-	      })
-	    },
-	    view (row) {
-	      this.$refs.view.setTenant(row)
-	      this.tenantViewVisible = true
-	    },
-	    // 【修改】表头上Btn-事件
-	    editOne() {
-	    	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.edit(this.selection[0]);
-	    },
-	    edit (row) {
-	      this.$refs.edit.setTenant(row)
-	      this.$refs.edit.type = "edit"
-	      this.dialog.title = this.$t("machining.common.marking")
-	      this.dialog.isVisible = true
-	    },
-	    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
-	      unqualifiedMgrApi.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)
-
-	    },
-	    cellClick (row, column) {
-	      if (column['columnKey'] === "operation") {
-	        return
-	      }
-	      let flag = false
-	      this.selection.forEach((item) => {
-	        if (item.id === row.id) {
-	          flag = true
-	          this.$refs.table.toggleRowSelection(row)
-	        }
-	      })
-
-	      if (!flag) {
-	        this.$refs.table.toggleRowSelection(row, true)
-	      }
-	    }
-	  }
-	}
-</script>
-<style lang="scss" scoped></style>
+<template>
+  <div class="app-container">
+		<!-- 搜索模块 -->
+    <div class="filter-container">
+    	<span>
+    		<span>{{$t("lineSide.searchForm.status")}}：</span>
+    		<el-select v-model="queryParams.model.handleStatus" :placeholder='$t("common.pleaseSelect")' size="medium" style="width: 150px;">
+        	<el-option
+			      v-for="item in audioStatus"
+			      :key="item.value"
+			      :label="item.label"
+			      :value="item.value">
+			    </el-option>
+      	</el-select>
+    	</span>
+    	<span style="margin-left: 15px;">
+    		<span>{{$t("machining.table.unQuality.uniqueCode")}}：</span>
+    		<el-input v-model="queryParams.model.uniqueCode" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
+    	</span>
+    	<span style="margin-left: 15px;">
+    		<span>订单名称：</span>
+    		<el-input v-model="queryParams.model.orderName" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
+    	</span>
+    	<span style="margin-left: 15px;">
+    		<span>零件名称：</span>
+    		<el-input v-model="queryParams.model.bomName" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
+    	</span>
+      <span style="margin-left: 15px;">
+	      <el-button plain type="primary" icon="el-icon-search" size="medium" @click="search">
+	        {{ $t("table.search") }}
+	      </el-button>
+	      <el-button plain type="warning" icon="el-icon-refresh" size="medium" @click="reset">
+	        {{ $t("table.reset") }}
+	      </el-button>
+      </span>
+    </div>
+
+    <!-- 功能按钮 -->
+    <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="['unqualified:tags']" type="primary" icon="el-icon-edit" size="medium" @click="editOne">
+	        {{ $t("machining.common.marking") }}
+	      </el-button>
+	      <el-button v-has-permission="['unqualified:delete']" type="danger" icon="el-icon-delete" size="medium" @click="batchDelete">
+	        {{ $t("table.delete") }}
+	      </el-button>
+    	</el-col>
+    </el-row>
+
+		<!-- 列表数据 -->
+    <el-table
+      :key="tableKey"
+      ref="table"
+      v-loading="loading"
+      :data="tableData.records"
+      border
+      fit
+      row-key="id"
+      style="width: 100%;"
+      @selection-change="onSelectChange"
+      @cell-click="cellClick"
+    >
+    	<!-- 序号 -->
+    	<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 align="center" type="selection" width="50" :reserve-selection="true" />
+      <!-- 单据编号 -->
+<!--      <el-table-column prop="no" :label='$t("machining.table.unQuality.no")' :show-overflow-tooltip="true"></el-table-column>-->
+      <!-- 产品名称 -->
+      <el-table-column prop="bomName" :label='$t("machining.table.unQuality.bomName")' :show-overflow-tooltip="true"></el-table-column>
+      <!-- 产品唯一码 -->
+      <el-table-column prop="uniqueCode" :label='$t("machining.table.unQuality.uniqueCode")' width="100" :show-overflow-tooltip="true"></el-table-column>
+
+      <el-table-column prop="procedureNo" :label='$t("machining.table.unQuality.procedureNo")' :show-overflow-tooltip="true"></el-table-column>
+
+      <el-table-column prop="procedureName" :label='$t("machining.table.unQuality.procedureName")' :show-overflow-tooltip="true"></el-table-column>
+      <!-- 所属订单号 -->
+      <el-table-column prop="orderNo" :label='$t("machining.table.unQuality.name10")' width="100" :show-overflow-tooltip="true"></el-table-column>
+
+      <el-table-column prop="orderName" :label='$t("machining.table.unQuality.name13")' width="110" :show-overflow-tooltip="true"></el-table-column>
+      <!-- 生成单据时间 -->
+      <el-table-column prop="createTime" :label='$t("machining.table.unQuality.name12")' width="150" :show-overflow-tooltip="true"></el-table-column>
+      <!-- 所属计划
+      <el-table-column prop="planNo" :label='$t("machining.table.unQuality.name11")' :show-overflow-tooltip="true"></el-table-column>-->
+      <!-- 质检结果 -->
+<!--      <el-table-column prop="testResult" :label='$t("machining.table.unQuality.testResult")' :show-overflow-tooltip="true">-->
+<!--      	<template slot-scope="{ row }">-->
+<!--	      	<el-tag v-if="row.testResult == '1'">{{$t("machining.common.testResult.one")}}</el-tag>-->
+<!--					<el-tag v-if="row.testResult == '0'" type="success">{{$t("machining.common.testResult.two")}}</el-tag>-->
+<!--				</template>-->
+<!--      </el-table-column>-->
+<!--      &lt;!&ndash; 数量 &ndash;&gt;-->
+<!--      <el-table-column prop="bomNum" :label='$t("machining.table.unQuality.bomNum")' :show-overflow-tooltip="true"></el-table-column>-->
+<!--      &lt;!&ndash; 质检人 &ndash;&gt;-->
+<!--      <el-table-column prop="handleUserName" :label='$t("machining.table.unQuality.handleUserName")' :show-overflow-tooltip="true"></el-table-column>-->
+      <!-- 处理状态 -->
+      <el-table-column prop="handleStatus" :label='$t("machining.table.unQuality.handleStatus")' align="center" width="90px">
+      	<template slot-scope="{ row }">
+	      	<el-tag v-if="row.handleStatus == '1'">{{$t("machining.common.handleStatus.one")}}</el-tag>
+					<el-tag v-if="row.handleStatus == '2'" type="success">{{$t("machining.common.handleStatus.two")}}</el-tag>
+				</template>
+      </el-table-column>
+      <!-- 处理方式 -->
+      <el-table-column prop="handleWay" :label='$t("machining.table.unQuality.handleWay")' align="center" width="90px">
+      	<template slot-scope="{ row }">
+	      	<el-tag v-if="row.handleWay == '1'">{{$t("machining.common.handleWay.one")}}</el-tag>
+					<el-tag v-if="row.handleWay == '2'" type="success">{{$t("machining.common.handleWay.two")}}</el-tag>
+				</template>
+      </el-table-column>
+      <!-- 补单单号 -->
+      <el-table-column prop="addOrderName" :label='$t("machining.table.unQuality.name9")' :show-overflow-tooltip="true"></el-table-column>
+
+      <!-- 生成人 -->
+<!--      <el-table-column prop="createUserName" :label='$t("machining.table.unQuality.createUserName")' :show-overflow-tooltip="true"></el-table-column>-->
+      <!-- 处理时间 -->
+      <el-table-column prop="handleTime" :label='$t("machining.table.unQuality.handleTime")' width="180px"></el-table-column>
+      <!-- 处理人 -->
+      <el-table-column prop="handleUserName" :label='$t("machining.table.unQuality.handleUserName")' width="180px"></el-table-column>
+      <!-- 操作 -->
+      <el-table-column
+        :label="$t('table.operation')"
+        fixed="right"
+        align="center"
+        column-key="operation"
+        width="60px"
+      >
+        <template slot-scope="{ row }">
+        	<!--<el-tooltip class="item" content="查看详情" effect="dark" placement="top-start">
+	          <i
+	            class="el-icon-view table-operation"
+	            style="color: #87d068;"
+	            @click="view(row)"
+	          />
+          </el-tooltip>-->
+          <!--<el-tooltip class="item" :content='$t("common.edit")' effect="dark" placement="top-start">
+	          <i
+	            class="el-icon-edit table-operation"
+	            style="color: #2db7f5;"
+	            @click="edit(row)"
+	          />
+          </el-tooltip>-->
+          <el-tooltip class="item" :content='$t("common.delete")' effect="dark" placement="top-start">
+	          <i
+	            class="el-icon-delete table-operation"
+	            style="color: #f50;"
+	            @click="singleDelete(row)"
+	          />
+          </el-tooltip>
+        </template>
+      </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"
+    />
+    <tenant-edit
+      ref="edit"
+      :dialog-visible="dialog.isVisible"
+      :title="dialog.title"
+      @close="editClose"
+      @success="editSuccess"
+    />
+    <tenant-view
+      ref="view"
+      :dialog-visible="tenantViewVisible"
+      @close="viewClose"
+    />
+    <el-dialog
+      v-el-drag-dialog
+      :close-on-click-modal="false"
+      :close-on-press-escape="true"
+      title="预览"
+      width="80%"
+      top="50px"
+      :visible.sync="preview.isVisible"
+    >
+      <el-scrollbar>
+        <div v-html="preview.context" />
+      </el-scrollbar>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+	// 【分页】组件
+	import Pagination from "@/components/Pagination"
+	// 【新增/修改】组件
+	import TenantEdit from "./components/Edit"
+	// 【查看】组件
+	import TenantView from "./components/View"
+	// 【不合格产品管理】-API
+	import unqualifiedMgrApi from "@/api/machiningClient/unqualifiedMgr"
+	// 【弹出框】elementui组件
+	import elDragDialog from '@/directive/el-drag-dialog'
+	// 共通函数
+	import { downloadFile, initEnums, initDicts, initQueryParams } from '@/utils/commons'
+
+	export default {
+	  name: "UnqualifiedMgr",
+	  directives: { elDragDialog },
+	  components: { Pagination, TenantEdit, TenantView },
+	  props: {
+	  },
+	  data () {
+	    return {
+	    	audioStatus: [],
+	      dialog: {
+	        isVisible: false,
+	        title: ""
+	      },
+	      preview: {
+	        isVisible: false,
+	        context: ''
+	      },
+	      tenantViewVisible: false,
+	      tableKey: 0,
+	      queryParams: initQueryParams({}),
+	      selection: [],
+	      loading: false,
+	      tableData: {
+	        total: 0
+	      },
+	      dicts: {
+          NATION: {}
+        },
+	      enums: {
+	        TenantTypeEnum: {},
+	        TenantStatusEnum: {}
+	      }
+	    }
+	  },
+	  // 实例已经在内存中创建好，此时data和methods已将ok,如果要操作data中的数据或是调用methods中的方法，最早只能在created中操作
+	  created() {
+	  	// 调用常量-审核状态
+	  	this.audioStatus = this.$constWKS.WAITINGLIST
+	  	// 加载【字典】
+	  	initDicts(['NATION'], this.dicts);
+	  	// 加载列表数据
+	  	this.fetch()
+		},
+	  computed: {
+	    currentUser () {
+	      return this.$store.state.account.user
+	    },
+	    nationList() {
+        return convertEnum(this.dicts.NATION)
+      }
+	  },
+	  mounted () {
+
+	  },
+	  methods: {
+	    viewClose () {
+	      this.tenantViewVisible = false
+	    },
+	    editClose () {
+	      this.dialog.isVisible = false
+	    },
+	    editSuccess () {
+	      this.search()
+	    },
+	    onSelectChange (selection) {
+	      this.selection = selection
+	    },
+	    search () {
+	      this.fetch({
+	        ...this.queryParams
+	      })
+	    },
+	    reset () {
+	      this.queryParams = initQueryParams({})
+	      this.$refs.table.clearSort()
+	      this.$refs.table.clearFilter()
+	      this.search()
+	    },
+	    add () {
+	      this.$refs.edit.type = "add"
+	      this.dialog.title = this.$t("machining.common.marking")
+	      this.dialog.isVisible = true
+	    },
+	    singleDelete (row) {
+	      this.$refs.table.clearSelection()
+	      this.$refs.table.toggleRowSelection(row, true)
+	      this.batchDelete()
+	    },
+	    batchDelete () {
+	      if (!this.selection.length) {
+	        this.$message({
+	          message: this.$t("tips.noDataSelected"),
+	          type: "warning"
+	        })
+	        return
+	      }
+
+	      this.$confirm(this.$t("lineSide.tips.wareTips"), this.$t("common.tips"), {
+	      	distinguishCancelAndClose: true,
+	        confirmButtonText: this.$t("common.confirm"),
+	        cancelButtonText: this.$t("common.cancel"),
+	        type: "warning"
+	      }).then(() => {
+	      	const ids = []
+		      this.selection.forEach(item => {
+		        ids.push(item.id)
+		      })
+		      this.delete(ids)
+	      }).catch(() => {})
+	    },
+	    clearSelections () {
+	      this.$refs.table.clearSelection()
+	    },
+	    delete (ids) {
+	      unqualifiedMgrApi.remove({ ids: ids }).then(response => {
+	        const res = response.data
+	        if (res.isSuccess) {
+	          this.$message({
+	            message: this.$t("tips.deleteSuccess"),
+	            type: "success"
+	          })
+	          this.search()
+	          // 清理已经删除的数据
+	          this.$refs.table.clearSelection()
+	        }
+	      })
+	    },
+	    view (row) {
+	      this.$refs.view.setTenant(row)
+	      this.tenantViewVisible = true
+	    },
+	    // 【修改】表头上Btn-事件
+	    editOne() {
+	    	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.edit(this.selection[0]);
+	    },
+	    edit (row) {
+	      this.$refs.edit.setTenant(row)
+	      this.$refs.edit.type = "edit"
+	      this.dialog.title = this.$t("machining.common.marking")
+	      this.dialog.isVisible = true
+	    },
+	    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
+	      unqualifiedMgrApi.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)
+
+	    },
+	    cellClick (row, column) {
+	      if (column['columnKey'] === "operation") {
+	        return
+	      }
+	      let flag = false
+	      this.selection.forEach((item) => {
+	        if (item.id === row.id) {
+	          flag = true
+	          this.$refs.table.toggleRowSelection(row)
+	        }
+	      })
+
+	      if (!flag) {
+	        this.$refs.table.toggleRowSelection(row, true)
+	      }
+	    }
+	  }
+	}
+</script>
+<style lang="scss" scoped></style>

imcs-ui/src/views/zuihou/qualityCenter/unqualifiedMgr/components/Edit.vue

@@ -1,11 +1,11 @@
 <template>
-  <el-dialog 
-  	:close-on-click-modal="false" 
-  	:close-on-press-escape="false" 
-  	:title="title" 
+  <el-dialog
+  	:close-on-click-modal="false"
+  	:close-on-press-escape="false"
+  	:title="title"
   	:append-to-body="true"
-  	:visible.sync="isVisible" 
-  	:width="width" 
+  	:visible.sync="isVisible"
+  	:width="width"
   	top="50px"
   >
     <el-form ref="form" :model="tenant" :rules="rules" label-position="right" label-width="130px">
@@ -14,15 +14,16 @@
         <template>
 				  <el-radio v-model="tenant.handleWay" label="1" @change="radioChange">{{$t("machining.common.handleWay.one")}}</el-radio>
 				  <el-radio v-model="tenant.handleWay" label="2" @change="radioChange">{{$t("machining.common.handleWay.two")}}</el-radio>
+          <el-radio v-model="tenant.handleWay" label="3" @change="radioChange">{{$t("machining.common.handleWay.three")}}</el-radio>
 				</template>
       </el-form-item>
       <!-- 补单订单 -->
-      <el-form-item v-if="tenant.handleWay == '1'" :label='$t("machining.form.addOrderId")+"："' prop="addOrderId">
-          <el-select 
-          	v-model="tenant.addOrderId" 
-          	clearable 
-          	filterable 
-          	:placeholder='$t("common.pleaseSelect")' 
+      <el-form-item v-if="tenant.handleWay == '1'||tenant.handleWay == '2'" :label='$t("machining.form.addOrderId")+"："' prop="addOrderId">
+          <el-select
+          	v-model="tenant.addOrderId"
+          	clearable
+          	filterable
+          	:placeholder='$t("common.pleaseSelect")'
           	style="width: 50%;"
           >
 				    <el-option
@@ -48,7 +49,7 @@
   </el-dialog>
 </template>
 <script>
-	
+
 // 【不合格产品管理】-API
 import unqualifiedMgrApi from "@/api/machiningClient/unqualifiedMgr"
 // 【订单管理】-API
@@ -117,7 +118,7 @@ export default {
   			this.tenant.addOrderId = "";
   		}
   	},
-  	
+
   	// 初始化，Form表单-函数
     initTenant () {
       return {
@@ -126,7 +127,7 @@ export default {
         handleStatus: ''
       }
     },
-    
+
     // 自适应width-函数
     initWidth () {
       this.screenWidth = document.body.clientWidth
@@ -138,25 +139,25 @@ export default {
         return '800px'
       }
     },
-    
+
     // 传值，设置数据-函数
     setTenant (val) {
     	if(val){
     		this.tenant = { ...val }
     	}
     },
-    
+
     close () {
       this.$emit('close')
     },
-    
+
     reset () {
       // 先清除校验，再清除表单，不然有奇怪的bug
       this.$refs.form.clearValidate()
       this.$refs.form.resetFields()
       this.tenant = this.initTenant()
     },
-    
+
     submitForm () {
       this.$refs.form.validate((valid) => {
         if (valid) {
@@ -171,7 +172,7 @@ export default {
         }
       })
     },
-    
+
     save () {
       unqualifiedMgrApi.noteUnqualifiedBom(this.tenant)
         .then((response) => {
@@ -192,7 +193,7 @@ export default {
           return true
         })
     },
-    
+
     update () {
       unqualifiedMgrApi.noteUnqualifiedBom(this.tenant)
         .then((response) => {
@@ -213,7 +214,7 @@ export default {
           return true
         })
     },
-    
+
     // 【补单订单】下拉数据
   	getOrderList(){
   		orderMgrApi.getList({auditStatus: '2'}).then(res => {