diff --git a/src/views/wms/bom/index.vue b/src/views/wms/bom/index.vue
index 82d210d..a77763a 100644
--- a/src/views/wms/bom/index.vue
+++ b/src/views/wms/bom/index.vue
@@ -138,7 +138,7 @@
       />
       <el-table-column
         label="产品名称"
-        align="center"
+        align="left"
         prop="productDescZh"
         width="350"
       />
@@ -150,7 +150,7 @@
       />
       <el-table-column
         label="组件名称"
-        align="center"
+        align="left"
         prop="componentDescZh"
         width="350"
       />
@@ -419,7 +419,7 @@ export default {
         component: null,
         productCode: null,
         bomHierarchy: null,
-        handle:null,
+        handle: null,
         factoryCode: null,
         productionVersion: null,
         bomCode: null,
@@ -581,32 +581,32 @@ export default {
     },
 
     load(tree, treeNode, resolve) {
-      console.log("treeNode:",treeNode);
-      console.log("tree:",tree);
-      console.log("resolve:",resolve);
+      console.log("treeNode:", treeNode);
+      console.log("tree:", tree);
+      console.log("resolve:", resolve);
       this.queryParams.pageNum = null;
       this.queryParams.pageSize = null;
-      if(tree.bomHierarchy == " " || tree.bomHierarchy == null){
+      if (tree.bomHierarchy == " " || tree.bomHierarchy == null) {
         this.queryParams.bomHierarchy = "1";
         this.queryParams.cumc = tree.cumc;
         this.queryParams.component = tree.component;
         this.queryParams.bomCode = tree.bomCode;
-      }else if(tree.bomHierarchy == "1"){
+      } else if (tree.bomHierarchy == "1") {
         this.queryParams.bomHierarchy = "2";
         this.queryParams.component = tree.component;
         this.queryParams.bomCode = tree.bomCode;
-      }else if(tree.bomHierarchy == "2"){
+      } else if (tree.bomHierarchy == "2") {
         this.queryParams.bomHierarchy = "3";
         this.queryParams.component = tree.component;
         this.queryParams.bomCode = tree.bomCode;
-      }else if(tree.bomHierarchy == "3"){
+      } else if (tree.bomHierarchy == "3") {
         this.queryParams.bomHierarchy = "4";
         this.queryParams.component = tree.component;
         this.queryParams.bomCode = tree.bomCode;
       }
-      listBom(this.queryParams).then(response => {
-        resolve(response.rows)
-      })
+      listBom(this.queryParams).then((response) => {
+        resolve(response.rows);
+      });
       this.queryParams.bomCode = null;
     },
   },
diff --git a/src/views/wms/factory/index.vue b/src/views/wms/factory/index.vue
index 510a5cf..ea0b322 100644
--- a/src/views/wms/factory/index.vue
+++ b/src/views/wms/factory/index.vue
@@ -1,126 +1,171 @@
 <template>
-	<div class="app-container">
-		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-			<el-form-item label="组织名称" prop="factoryName">
-				<el-input
-					v-model="queryParams.factoryName"
-					placeholder="请输入组织名称"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="组织名称" prop="factoryName">
+        <el-input
+          v-model="queryParams.factoryName"
+          placeholder="请输入组织名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
-      	<el-form-item label="组织编码" prop="factoryCode">
-      		<el-input
-      			v-model="queryParams.factoryCode"
-      			placeholder="请输入组织编码"
-      			clearable
-      			@keyup.enter.native="handleQuery"
-      		/>
-        </el-form-item>
-			<el-form-item label="启用状态" prop="status">
+      <el-form-item label="组织编码" prop="factoryCode">
+        <el-input
+          v-model="queryParams.factoryCode"
+          placeholder="请输入组织编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="启用状态" prop="status">
         <el-select
           v-model="queryParams.status"
           placeholder="请选择启用状态"
           @change="$forceUpdate()"
           clearable
-          style="width:205px"
-          @keyup.enter.native="handleQuery">
-          <el-option v-for="item in options" :key="item.status" :label="item.label" :value="item.status"></el-option>
-          </el-select>
-			</el-form-item>
-			<el-form-item>
-			<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-			</el-form-item>
-		</el-form>
+          style="width: 205px"
+          @keyup.enter.native="handleQuery"
+        >
+          <el-option
+            v-for="item in options"
+            :key="item.status"
+            :label="item.label"
+            :value="item.status"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
 
-		<el-row :gutter="10" class="mb8">
-			<el-col :span="1.5">
-				<el-button
-					type="primary"
-					plain
-					icon="el-icon-plus"
-					size="mini"
-					@click="handleAdd"
-					v-hasPermi="['wms:factory:add']"
-				>新增</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="info"
-					plain
-					icon="el-icon-sort"
-					size="mini"
-					@click="toggleExpandAll"
-				>展开/折叠</el-button>
-			</el-col>
-			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-		</el-row>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['wms:factory:add']"
+          >新增</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-sort"
+          size="mini"
+          @click="toggleExpandAll"
+          >展开/折叠</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
 
-		<el-table
-			v-if="refreshTable"
-			v-loading="loading"
-			:data="factoryList"
-			row-key="factoryId"
-			:default-expand-all="isExpandAll"
-			:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-		>
-			<el-table-column label="组织名称" align="center" prop="factoryName" width="350"/>
-			<el-table-column label="组织编码" align="center" prop="factoryCode" />
-      <el-table-column prop="ftype" label="工厂建模类型" width="100" align="center">
+    <el-table
+      v-if="refreshTable"
+      v-loading="loading"
+      :data="factoryList"
+      row-key="factoryId"
+      :default-expand-all="isExpandAll"
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+    >
+      <el-table-column
+        label="组织名称"
+        align="left"
+        prop="factoryName"
+        width="350"
+      />
+      <el-table-column label="组织编码" align="center" prop="factoryCode" />
+      <el-table-column
+        prop="ftype"
+        label="工厂建模类型"
+        width="100"
+        align="center"
+      >
         <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.f_type"
-            :value="scope.row.ftype"
-          />
+          <dict-tag :options="dict.type.f_type" :value="scope.row.ftype" />
         </template>
       </el-table-column>
-			<el-table-column label="创建人" align="center" prop="createBy" />
-      		<el-table-column label="创建时间" align="center" prop="createTime" />
-      		<el-table-column prop="status" label="是否启用" align="center" >
-         		<template slot-scope="scope">
-            		{{ scope.row.status == 1 ? "启用" : "停用" }}
-         		</template>
-      		</el-table-column>
-			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-				<template slot-scope="scope">
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-edit"
-						@click="handleUpdate(scope.row)"
-						v-hasPermi="['wms:factory:edit']"
-					>修改</el-button>
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-plus"
-						@click="handleAdd(scope.row)"
-						v-hasPermi="['wms:factory:add']"
-					>新增</el-button>
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-delete"
-						@click="handleDelete(scope.row)"
-						v-hasPermi="['wms:factory:remove']"
-					>删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
+      <el-table-column label="创建人" align="center" prop="createBy" />
+      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column prop="status" label="是否启用" align="center">
+        <template slot-scope="scope">
+          {{ scope.row.status == 1 ? "启用" : "停用" }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['wms:factory:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
+            @click="handleAdd(scope.row)"
+            v-hasPermi="['wms:factory:add']"
+            >新增</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['wms:factory:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
 
-		<!-- 添加或修改工厂模型对话框 -->
-		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-			<el-form ref="form" :model="form" :rules="rules" label-width="120px">
-				<el-form-item label="父组织名" prop="parentId" style="width:350px">
-					<treeselect v-model="form.parentId" :options="factoryOptions" :normalizer="normalizer" placeholder="请选择父组织id" />
-				</el-form-item>
-				<el-form-item label="组织名称" prop="factoryName" style="width:350px">
-					<el-input v-model="form.factoryName" placeholder="请输入组织名称" />
-				</el-form-item>
-				<el-form-item label="组织编码" prop="factoryCode" style="width:350px">
-        	<el-input v-model="form.factoryCode" placeholder="请输入组织编码" />
-   			</el-form-item>
+    <!-- 添加或修改工厂模型对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="父组织名" prop="parentId" style="width: 350px">
+          <treeselect
+            v-model="form.parentId"
+            :options="factoryOptions"
+            :normalizer="normalizer"
+            placeholder="请选择父组织id"
+          />
+        </el-form-item>
+        <el-form-item label="组织名称" prop="factoryName" style="width: 350px">
+          <el-input v-model="form.factoryName" placeholder="请输入组织名称" />
+        </el-form-item>
+        <el-form-item label="组织编码" prop="factoryCode" style="width: 350px">
+          <el-input v-model="form.factoryCode" placeholder="请输入组织编码" />
+        </el-form-item>
         <el-form-item label="工厂建模分类" prop="ftype">
           <el-select
             v-model="form.ftype"
@@ -130,228 +175,254 @@
           >
             <el-option
               v-for="dict in dict.type.f_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
             ></el-option>
           </el-select>
         </el-form-item>
-				<el-form-item label="负责人" prop="leader" style="width:350px">
-					<el-input v-model="form.leader" placeholder="请输入负责人" />
-				</el-form-item>
-				<el-form-item label="联系电话" prop="phone" style="width:350px">
-					<el-input v-model="form.phone" placeholder="请输入联系电话" />
-				</el-form-item>
-				<el-form-item label="邮箱" prop="email" style="width:350px">
-					<el-input v-model="form.email" placeholder="请输入邮箱" />
-				</el-form-item>
-				<el-form-item label="是否启用" prop="status" >
-          <el-select v-model="form.status" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable style="width:230px">
-            <el-option v-for="item in options" :key="item.status" :label="item.label" :value="item.status"></el-option>
+        <el-form-item label="负责人" prop="leader" style="width: 350px">
+          <el-input v-model="form.leader" placeholder="请输入负责人" />
+        </el-form-item>
+        <el-form-item label="联系电话" prop="phone" style="width: 350px">
+          <el-input v-model="form.phone" placeholder="请输入联系电话" />
+        </el-form-item>
+        <el-form-item label="邮箱" prop="email" style="width: 350px">
+          <el-input v-model="form.email" placeholder="请输入邮箱" />
+        </el-form-item>
+        <el-form-item label="是否启用" prop="status">
+          <el-select
+            v-model="form.status"
+            placeholder="请选择是否启用"
+            @change="$forceUpdate()"
+            clearable
+            style="width: 230px"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.status"
+              :label="item.label"
+              :value="item.status"
+            ></el-option>
           </el-select>
         </el-form-item>
-			</el-form>
-			<div slot="footer" class="dialog-footer">
-				<el-button type="primary" @click="submitForm">确 定</el-button>
-				<el-button @click="cancel">取 消</el-button>
-			</div>
-		</el-dialog>
-	</div>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-import { listFactory, getFactory, delFactory, addFactory, updateFactory } from "@/api/wms/factory";
+import {
+  listFactory,
+  getFactory,
+  delFactory,
+  addFactory,
+  updateFactory,
+} from "@/api/wms/factory";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
-	name: "Factory",
-  dicts: [
-    "f_type",
-  ],
-	components: {
-		Treeselect
-	},
-	data() {
-		return {
-			// 遮罩层
-			loading: true,
-			// 显示搜索条件
-			showSearch: true,
-			// 工厂模型表格数据
-			factoryList: [],
-			// 工厂模型树选项
-			factoryOptions: [],
-			// 弹出层标题
-			title: "",
-			// 是否显示弹出层
-			open: false,
-			// 是否展开，默认全部展开
-			isExpandAll: true,
-			// 重新渲染表格状态
-			refreshTable: true,
-			// 查询参数
-			queryParams: {
-				parentId: null,
-				ancestors: null,
-				factoryName: null,
-				orderNum: null,
-				leader: null,
-				phone: null,
-				email: null,
-				status: null,
-			},
-			 options: [{
-                status: "1",
-                label: '启用'
-              }, {
-                status: "0",
-                label: '停用'
-              }],
-			// 表单参数
-			form: {},
-			// 表单校验
-      			rules: {
-      			  factoryCode: [
-            	  { required: true, message: "组织编码不能为空", trigger: "blur" }
-            	],
-            	factoryName: [
-            		{ required: true, message: "组织名称不能为空", trigger: "blur" }
-            	],
-      			  status: [
-              	{ required: true, message: "组织状态不能为空", trigger: "blur" }
-              ]
-      			}
-		};
-	},
-	created() {
-		this.getList();
-	},
-	methods: {
-		/** 查询工厂模型列表 */
-		getList() {
-			this.loading = true;
-			listFactory(this.queryParams).then(response => {
-				this.factoryList = this.handleTree(response.data, "factoryId", "parentId");
-				this.loading = false;
-			});
-		},
-		/** 转换工厂模型数据结构 */
-		normalizer(node) {
-			if (node.children && !node.children.length) {
-				delete node.children;
-			}
-			return {
-				id: node.factoryId,
-				label: node.factoryName,
-				children: node.children
-			};
-		},
-	/** 查询工厂模型下拉树结构 */
-		getTreeselect() {
-			listFactory().then(response => {
-				this.factoryOptions = [];
-				const data = { factoryId: 0, factoryName: '顶级节点', children: [] };
-				data.children = this.handleTree(response.data, "factoryId", "parentId");
-				this.factoryOptions.push(data);
-			});
-		},
-		// 取消按钮
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		// 表单重置
-		reset() {
-			this.form = {
-				factoryId: null,
-				parentId: null,
-				ancestors: null,
-				factoryName: null,
-				orderNum: null,
-				leader: null,
-				phone: null,
-				email: null,
-				status: null,
-				delFlag: null,
-				createBy: null,
-				createTime: null,
-				updateBy: null,
-				updateTime: null
-			};
-			this.resetForm("form");
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm("queryForm");
-			this.handleQuery();
-		},
-		/** 新增按钮操作 */
-		handleAdd(row) {
-			this.reset();
-			this.getTreeselect();
-			if (row != null && row.factoryId) {
-				this.form.parentId = row.factoryId;
-			} else {
-				this.form.parentId = 0;
-			}
-			this.open = true;
-			this.title = "添加工厂模型";
-		},
-		/** 展开/折叠操作 */
-		toggleExpandAll() {
-			this.refreshTable = false;
-			this.isExpandAll = !this.isExpandAll;
-			this.$nextTick(() => {
-				this.refreshTable = true;
-			});
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			this.getTreeselect();
-			if (row != null) {
-				this.form.parentId = row.factoryId;
-			}
-			getFactory(row.factoryId).then(response => {
-				this.form = response.data;
-				this.open = true;
-				this.title = "修改工厂模型";
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs["form"].validate(valid => {
-				if (valid) {
-					if (this.form.factoryId != null) {
-						updateFactory(this.form).then(response => {
-							this.$modal.msgSuccess("修改成功");
-							this.open = false;
-							this.getList();
-						});
-					} else {
-						addFactory(this.form).then(response => {
-							this.$modal.msgSuccess("新增成功");
-							this.open = false;
-							this.getList();
-						});
-					}
-				}
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			this.$modal.confirm('是否确认删除工厂模型编号为"' + row.factoryId + '"的数据项？').then(function() {
-				return delFactory(row.factoryId);
-			}).then(() => {
-				this.getList();
-				this.$modal.msgSuccess("删除成功");
-			}).catch(() => {});
-		}
-	}
+  name: "Factory",
+  dicts: ["f_type"],
+  components: {
+    Treeselect,
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 工厂模型表格数据
+      factoryList: [],
+      // 工厂模型树选项
+      factoryOptions: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 查询参数
+      queryParams: {
+        parentId: null,
+        ancestors: null,
+        factoryName: null,
+        orderNum: null,
+        leader: null,
+        phone: null,
+        email: null,
+        status: null,
+      },
+      options: [
+        {
+          status: "1",
+          label: "启用",
+        },
+        {
+          status: "0",
+          label: "停用",
+        },
+      ],
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        factoryCode: [
+          { required: true, message: "组织编码不能为空", trigger: "blur" },
+        ],
+        factoryName: [
+          { required: true, message: "组织名称不能为空", trigger: "blur" },
+        ],
+        status: [
+          { required: true, message: "组织状态不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询工厂模型列表 */
+    getList() {
+      this.loading = true;
+      listFactory(this.queryParams).then((response) => {
+        this.factoryList = this.handleTree(
+          response.data,
+          "factoryId",
+          "parentId"
+        );
+        this.loading = false;
+      });
+    },
+    /** 转换工厂模型数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.factoryId,
+        label: node.factoryName,
+        children: node.children,
+      };
+    },
+    /** 查询工厂模型下拉树结构 */
+    getTreeselect() {
+      listFactory().then((response) => {
+        this.factoryOptions = [];
+        const data = { factoryId: 0, factoryName: "顶级节点", children: [] };
+        data.children = this.handleTree(response.data, "factoryId", "parentId");
+        this.factoryOptions.push(data);
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        factoryId: null,
+        parentId: null,
+        ancestors: null,
+        factoryName: null,
+        orderNum: null,
+        leader: null,
+        phone: null,
+        email: null,
+        status: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null && row.factoryId) {
+        this.form.parentId = row.factoryId;
+      } else {
+        this.form.parentId = 0;
+      }
+      this.open = true;
+      this.title = "添加工厂模型";
+    },
+    /** 展开/折叠操作 */
+    toggleExpandAll() {
+      this.refreshTable = false;
+      this.isExpandAll = !this.isExpandAll;
+      this.$nextTick(() => {
+        this.refreshTable = true;
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null) {
+        this.form.parentId = row.factoryId;
+      }
+      getFactory(row.factoryId).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改工厂模型";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.factoryId != null) {
+            updateFactory(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addFactory(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal
+        .confirm('是否确认删除工厂模型编号为"' + row.factoryId + '"的数据项？')
+        .then(function () {
+          return delFactory(row.factoryId);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+  },
 };
 </script>
diff --git a/src/views/wms/product/index.vue b/src/views/wms/product/index.vue
index bf4dc3b..535b20e 100644
--- a/src/views/wms/product/index.vue
+++ b/src/views/wms/product/index.vue
@@ -1,97 +1,143 @@
 <template>
-	<div class="app-container">
-		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="108px">
-			<el-form-item label="产品/物料编码" prop="productCode">
-				<el-input
-					v-model="queryParams.productCode"
-					placeholder="请输入产品/物料编码"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="产品/物料名称" prop="productDescZh">
-				<el-input
-					v-model="queryParams.productDescZh"
-					placeholder="请输入产品/物料名称"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item>
-				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-			</el-form-item>
-		</el-form>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="108px"
+    >
+      <el-form-item label="产品/物料编码" prop="productCode">
+        <el-input
+          v-model="queryParams.productCode"
+          placeholder="请输入产品/物料编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="产品/物料名称" prop="productDescZh">
+        <el-input
+          v-model="queryParams.productDescZh"
+          placeholder="请输入产品/物料名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
 
-		<el-row :gutter="10" class="mb8">
-			<el-col :span="1.5">
-				<el-button
-					type="primary"
-					plain
-					icon="el-icon-plus"
-					size="mini"
-					@click="handleAdd"
-					v-hasPermi="['wms:product:add']"
-				>新增</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="success"
-					plain
-					icon="el-icon-edit"
-					size="mini"
-					:disabled="single"
-					@click="handleUpdate"
-					v-hasPermi="['wms:product:edit']"
-				>修改</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="danger"
-					plain
-					icon="el-icon-delete"
-					size="mini"
-					:disabled="multiple"
-					@click="handleDelete"
-					v-hasPermi="['wms:product:remove']"
-				>删除</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="warning"
-					plain
-					icon="el-icon-download"
-					size="mini"
-					@click="handleExport"
-					v-hasPermi="['wms:product:export']"
-				>导出</el-button>
-			</el-col>
-			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-		</el-row>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['wms:product:add']"
+          >新增</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['wms:product:edit']"
+          >修改</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['wms:product:remove']"
+          >删除</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['wms:product:export']"
+          >导出</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
 
-
-		<el-table v-loading="loading" :data="productList" @selection-change="handleSelectionChange">
-			<el-table-column type="selection" width="55" align="center" />
-			<!-- <el-table-column label="主键ID" align="center" prop="productId" /> -->
-			<el-table-column label="产品/物料编码" align="center" prop="productCode" width="200">
-						<template slot-scope="scope">
-                <el-button
-                  type="text"
-                  @click="handleView(scope.row)"
-                  v-hasPermi="['wms:equipment:query']"
-                >{{scope.row.productCode}}</el-button>
-              </template>
+    <el-table
+      v-loading="loading"
+      :data="productList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column label="主键ID" align="center" prop="productId" /> -->
+      <el-table-column
+        label="产品/物料编码"
+        align="center"
+        prop="productCode"
+        width="200"
+      >
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            @click="handleView(scope.row)"
+            v-hasPermi="['wms:equipment:query']"
+            >{{ scope.row.productCode }}</el-button
+          >
+        </template>
       </el-table-column>
-			<el-table-column label="产品/物料名称" align="center" prop="productDescZh" width="400"/>
-			<el-table-column label="物料组编码" align="center" prop="productGroup" width="150"/>
-			<el-table-column label="物料组名称" align="center" prop="productGroupName" width="200"/>
-			<el-table-column label="物料类别" align="center" prop="mtart">
+      <el-table-column
+        label="产品/物料名称"
+        align="left"
+        prop="productDescZh"
+        width="350"
+      />
+      <el-table-column
+        label="物料组编码"
+        align="center"
+        prop="productGroup"
+        width="150"
+      />
+      <el-table-column
+        label="物料组名称"
+        align="center"
+        prop="productGroupName"
+        width="200"
+      />
+      <el-table-column label="物料类别" align="center" prop="mtart">
         <template slot-scope="scope">
           {{ scope.row.mtart == "material_type1" ? "料罐物料" : "其他类别" }}
         </template>
       </el-table-column>
-			<!-- 中文描述也就是产品名称 -->
-			<!-- <el-table-column label="英文描述" align="center" prop="productDescEn" />
+      <!-- 中文描述也就是产品名称 -->
+      <!-- <el-table-column label="英文描述" align="center" prop="productDescEn" />
 						<el-table-column label="产品类别" align="center" prop="productGroup">
       			  <template slot-scope="scope">
                 {{ scope.row.productGroup == "material_type1" ? "产品类别1" : "产品类别2" }}
@@ -105,18 +151,18 @@
 			<el-table-column label="长" align="center" prop="length" />
 			<el-table-column label="宽" align="center" prop="width" />
 			<el-table-column label="高" align="center" prop="height" /> -->
-			<!-- <el-table-column label="毛重" align="center" prop="grossWeight" />
+      <!-- <el-table-column label="毛重" align="center" prop="grossWeight" />
 			<el-table-column label="净重" align="center" prop="netWeight" />
 			<el-table-column label="皮重" align="center" prop="tareWeight" />
 			<el-table-column label="体积" align="center" prop="volume" />
 			<el-table-column label="单价" align="center" prop="unitPrice" />
 			<el-table-column label="工厂编码" align="center" prop="factoryCode" /> -->
-			<el-table-column label="是否启用" align="center" prop="activeFlag">
-			   <template slot-scope="scope">
-           {{ scope.row.activeFlag == 1 ? "是" : "否" }}
-         </template>
+      <el-table-column label="是否启用" align="center" prop="activeFlag">
+        <template slot-scope="scope">
+          {{ scope.row.activeFlag == 1 ? "是" : "否" }}
+        </template>
       </el-table-column>
-			<!-- <el-table-column label="${comment}" align="center" prop="syncFlag" />
+      <!-- <el-table-column label="${comment}" align="center" prop="syncFlag" />
 			<el-table-column label="${comment}" align="center" prop="primaryUom" />
 			<el-table-column label="订单单位" align="center" prop="bstme" />
 			<el-table-column label="${comment}" align="center" prop="basicOrder" />
@@ -126,56 +172,92 @@
 			<el-table-column label="${comment}" align="center" prop="convIssue" />
 			<el-table-column label="是否补料" align="center" prop="appendFlag" />
 			<el-table-column label="补料比例" align="center" prop="appendPercent" /> -->
-			<el-table-column label="创建人" align="center" prop="createBy" />
-			<el-table-column label="创建时间" align="center" prop="createTime" width="200"/>
-			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-				<template slot-scope="scope">
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-edit"
-						@click="handleUpdate(scope.row)"
-						v-hasPermi="['wms:product:edit']"
-					>修改</el-button>
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-delete"
-						@click="handleDelete(scope.row)"
-						v-hasPermi="['wms:product:remove']"
-					>删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
+      <el-table-column label="创建人" align="center" prop="createBy" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="200"
+      />
+      <el-table-column
+        label="操作"
+        align="center"
+		width="150"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['wms:product:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['wms:product:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
 
-		<pagination
-			v-show="total>0"
-			:total="total"
-			:page.sync="queryParams.pageNum"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList"
-		/>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
-		<!-- 添加或修改产品信息对话框 -->
-		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-			<el-form ref="form" :model="form" :rules="rules" label-width="120px">
-				<el-form-item label="产品/物料编码" prop="productCode">
-					<el-input v-model="form.productCode" placeholder="请输入产品编码" style="width:320px"/>
-				</el-form-item>
-				<el-form-item label="产品/物料名称" prop="productDescZh">
-					<el-input v-model="form.productDescZh" placeholder="请输入产品名称" style="width:320px"/>
-				</el-form-item>
-				<el-form-item label="产品/物料型号" prop="productModel">
-        	<el-input v-model="form.productModel" placeholder="请输入产品型号" style="width:320px"/>
+    <!-- 添加或修改产品信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="产品/物料编码" prop="productCode">
+          <el-input
+            v-model="form.productCode"
+            placeholder="请输入产品编码"
+            style="width: 320px"
+          />
+        </el-form-item>
+        <el-form-item label="产品/物料名称" prop="productDescZh">
+          <el-input
+            v-model="form.productDescZh"
+            placeholder="请输入产品名称"
+            style="width: 320px"
+          />
+        </el-form-item>
+        <el-form-item label="产品/物料型号" prop="productModel">
+          <el-input
+            v-model="form.productModel"
+            placeholder="请输入产品型号"
+            style="width: 320px"
+          />
         </el-form-item>
         <el-form-item label="产品/物料组编码" prop="productGroup">
-        	<el-input v-model="form.productGroup" placeholder="请输入物料组编码" style="width:320px"/>
+          <el-input
+            v-model="form.productGroup"
+            placeholder="请输入物料组编码"
+            style="width: 320px"
+          />
         </el-form-item>
         <el-form-item label="产品/物料组名称" prop="productGroupName">
-          <el-input v-model="form.productGroupName" placeholder="请输入物料组名称" style="width:320px"/>
+          <el-input
+            v-model="form.productGroupName"
+            placeholder="请输入物料组名称"
+            style="width: 320px"
+          />
         </el-form-item>
-				<el-form-item label="物料类别" prop="mtart">
-        	<el-select v-model="form.mtart" placeholder="请选择物料类别" style="width:320px">
+        <el-form-item label="物料类别" prop="mtart">
+          <el-select
+            v-model="form.mtart"
+            placeholder="请选择物料类别"
+            style="width: 320px"
+          >
             <el-option
               v-for="dict in dict.type.material_type"
               :key="dict.value"
@@ -184,7 +266,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-				<!-- <el-form-item label="英文描述" prop="productDescEn">
+        <!-- <el-form-item label="英文描述" prop="productDescEn">
 					<el-input v-model="form.productDescEn" type="textarea" placeholder="请输入内容" />
 				</el-form-item>
 				<el-form-item label="序列号规则代码" prop="ruleCode">
@@ -250,12 +332,23 @@
 				<el-form-item label="工厂编码" prop="factoryCode">
 					<el-input v-model="form.factoryCode" placeholder="请输入工厂编码" />
 				</el-form-item> -->
-				<el-form-item label="是否启用" prop="activeFlag">
-				  <el-select v-model="form.activeFlag" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable style="width:320px">
-            <el-option v-for="item in options" :key="item.activeFlag" :label="item.label" :value="item.activeFlag"></el-option>
+        <el-form-item label="是否启用" prop="activeFlag">
+          <el-select
+            v-model="form.activeFlag"
+            placeholder="请选择是否启用"
+            @change="$forceUpdate()"
+            clearable
+            style="width: 320px"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.activeFlag"
+              :label="item.label"
+              :value="item.activeFlag"
+            ></el-option>
           </el-select>
-				</el-form-item>
-				<!-- <el-form-item label="${comment}" prop="syncFlag">
+        </el-form-item>
+        <!-- <el-form-item label="${comment}" prop="syncFlag">
 					<el-input v-model="form.syncFlag" placeholder="请输入${comment}" />
 				</el-form-item>
 				<el-form-item label="${comment}" prop="primaryUom">
@@ -288,362 +381,470 @@
 				<el-form-item label="补料比例" prop="appendPercent">
 					<el-input v-model="form.appendPercent" placeholder="请输入补料比例" />
 				</el-form-item> -->
-			</el-form>
-			<div slot="footer" class="dialog-footer">
-				<el-button type="primary" @click="submitForm">确 定</el-button>
-				<el-button @click="cancel">取 消</el-button>
-			</div>
-		</el-dialog>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
 
-
-		<!-- 查看物料附属信息 -->
-    		<el-dialog :title="title" :visible.sync="openAttached" width="1000px" append-to-body>
-    			<el-form ref="form" :model="form" :rules="rules" label-width="100px">
-    				<el-row :gutter="10" class="mb8">
-                        <el-col :span="12">
-          					<el-form-item label="产品编号" prop="productCode">
-                          		<el-input v-model="form.productCode" placeholder="" disabled style="width:320px"/>
-                          	</el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-          					<el-form-item label="品类" prop="category">
-                          		<el-input v-model="form.category" placeholder="" disabled style="width:320px"/>
-                        	</el-form-item>
-                        </el-col>
-                    </el-row>
-					<el-row :gutter="10" class="mb8">
-                        <el-col :span="12">
-          					<el-form-item label="每PC单圈" prop="pc">
-                          		<el-input v-model="form.pc" placeholder="" disabled style="width:320px"/>
-                          	</el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-          					<el-form-item label="标准效率" prop="iei">
-                          		<el-input v-model="form.iei" placeholder="" disabled style="width:320px"/>
-                          	</el-form-item>
-                        </el-col>
-                    </el-row>
-					<el-row :gutter="10" class="mb8">
-                        <el-col :span="12">
-          					<el-form-item label="标准用人" prop="manStandar">
-                          		<el-input v-model="form.manStandar" placeholder="" disabled style="width:320px"/>
-                          	</el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-          					<el-form-item label="喷药方式" prop="sprayWay">
-                        		<el-input v-model="form.sprayWay" placeholder="" disabled style="width:320px"/>
-                        	</el-form-item>
-                        </el-col>
-                    </el-row>
-					<el-row :gutter="10" class="mb8">
-                        <el-col :span="12">
-          					<el-form-item label="白坯直径" prop="blankDiameter">
-                        		<el-input v-model="form.blankDiameter" placeholder="" disabled style="width:320px"/>
-                        	</el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-          					<el-form-item label="白坯物料号" prop="blankNo">
-                          		<el-input v-model="form.blankNo" placeholder="" disabled style="width:320px"/>
-                          	</el-form-item>
-                        </el-col>
-                    </el-row>
-					<el-row :gutter="10" class="mb8">
-                        <el-col :span="12">
-          					<el-form-item label="标准喷药量" prop="sprayVolume">
-                                <el-input v-model="form.sprayVolume" placeholder="" disabled style="width:320px"/>
-                                    </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-          					<el-form-item label="药液料号" prop="liquidNo">
-                          		<el-input v-model="form.liquidNo" placeholder="" disabled style="width:320px"/>
-                          	</el-form-item>
-                        </el-col>
-                    </el-row>
-					<el-row :gutter="10" class="mb8">
-                        <el-col :span="12">
-          					<el-form-item label="标准内膜用量" prop="endometrialDosage">
-                          		<el-input v-model="form.endometrialDosage" placeholder="" disabled style="width:320px"/>
-                          	</el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-          					<el-form-item label="标准外模用量(KG/PC)" prop="outerFilmDosage">
-                          		<el-input v-model="form.outerFilmDosage" placeholder="" disabled style="width:320px"/>
-                          	</el-form-item>
-                        </el-col>
-                    </el-row>
-					<el-row :gutter="10" class="mb8">
-                        <el-col :span="12">
-          					<el-form-item label="支架" prop="support">
-                        		<el-input v-model="form.support" placeholder="" disabled style="width:320px"/>
-                        	</el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-          					<el-form-item label="支架物料号" prop="supportNo">
-                        		<el-input v-model="form.supportNo" placeholder="" disabled style="width:320px"/>
-                        	</el-form-item>
-                        </el-col>
-                    </el-row>
-					<el-row :gutter="10" class="mb8">
-                        <el-col :span="12">
-          					<el-form-item label="吸塑" prop="pvc">
-                        		<el-input v-model="form.pvc" placeholder="" disabled style="width:320px"/>
-                        	</el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-          					<el-form-item label="支架盘" prop="supportPlate">
-                      			<el-input v-model="form.supportPlate" placeholder="" disabled style="width:320px"/>
-                      		</el-form-item>
-                        </el-col>
-                          </el-row>
-    						<el-form-item label="其它" prop="other">
-    							<el-input v-model="form.other" placeholder="" disabled style="width:320px"/>
-    						</el-form-item>
-    				</el-form>
-    			<div slot="footer" class="dialog-footer">
-    				<el-button @click="cancelAttached">取 消</el-button>
-    			</div>
-    		</el-dialog>
-	</div>
+    <!-- 查看物料附属信息 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="openAttached"
+      width="1000px"
+      append-to-body
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="12">
+            <el-form-item label="产品编号" prop="productCode">
+              <el-input
+                v-model="form.productCode"
+                placeholder=""
+                disabled
+                style="width: 320px"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="品类" prop="category">
+              <el-input
+                v-model="form.category"
+                placeholder=""
+                disabled
+                style="width: 320px"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="12">
+            <el-form-item label="每PC单圈" prop="pc">
+              <el-input
+                v-model="form.pc"
+                placeholder=""
+                disabled
+                style="width: 320px"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="标准效率" prop="iei">
+              <el-input
+                v-model="form.iei"
+                placeholder=""
+                disabled
+                style="width: 320px"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="12">
+            <el-form-item label="标准用人" prop="manStandar">
+              <el-input
+                v-model="form.manStandar"
+                placeholder=""
+                disabled
+                style="width: 320px"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="喷药方式" prop="sprayWay">
+              <el-input
+                v-model="form.sprayWay"
+                placeholder=""
+                disabled
+                style="width: 320px"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="12">
+            <el-form-item label="白坯直径" prop="blankDiameter">
+              <el-input
+                v-model="form.blankDiameter"
+                placeholder=""
+                disabled
+                style="width: 320px"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="白坯物料号" prop="blankNo">
+              <el-input
+                v-model="form.blankNo"
+                placeholder=""
+                disabled
+                style="width: 320px"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="12">
+            <el-form-item label="标准喷药量" prop="sprayVolume">
+              <el-input
+                v-model="form.sprayVolume"
+                placeholder=""
+                disabled
+                style="width: 320px"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="药液料号" prop="liquidNo">
+              <el-input
+                v-model="form.liquidNo"
+                placeholder=""
+                disabled
+                style="width: 320px"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="12">
+            <el-form-item label="标准内膜用量" prop="endometrialDosage">
+              <el-input
+                v-model="form.endometrialDosage"
+                placeholder=""
+                disabled
+                style="width: 320px"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="标准外模用量(KG/PC)" prop="outerFilmDosage">
+              <el-input
+                v-model="form.outerFilmDosage"
+                placeholder=""
+                disabled
+                style="width: 320px"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="12">
+            <el-form-item label="支架" prop="support">
+              <el-input
+                v-model="form.support"
+                placeholder=""
+                disabled
+                style="width: 320px"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="支架物料号" prop="supportNo">
+              <el-input
+                v-model="form.supportNo"
+                placeholder=""
+                disabled
+                style="width: 320px"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="12">
+            <el-form-item label="吸塑" prop="pvc">
+              <el-input
+                v-model="form.pvc"
+                placeholder=""
+                disabled
+                style="width: 320px"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="支架盘" prop="supportPlate">
+              <el-input
+                v-model="form.supportPlate"
+                placeholder=""
+                disabled
+                style="width: 320px"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="其它" prop="other">
+          <el-input
+            v-model="form.other"
+            placeholder=""
+            disabled
+            style="width: 320px"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancelAttached">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-import { listProduct, getProduct, delProduct, addProduct, updateProduct } from "@/api/wms/product";
+import {
+  listProduct,
+  getProduct,
+  delProduct,
+  addProduct,
+  updateProduct,
+} from "@/api/wms/product";
 
 export default {
-	name: "Product",
-	dicts: ['sys_normal_disable', 'material_type'],
-	data() {
-		return {
-			// 遮罩层
-			loading: true,
-			// 选中数组
-			ids: [],
-			// 非单个禁用
-			single: true,
-			// 非多个禁用
-			multiple: true,
-			// 显示搜索条件
-			showSearch: true,
-			// 总条数
-			total: 0,
-			// 产品信息表格数据
-			productList: [],
-			// 弹出层标题
-			title: "",
-			// 是否显示弹出层
-			open: false,
-			openAttached: false,
-			// 查询参数
-			queryParams: {
-				pageNum: 1,
-				pageSize: 10,
-				productCode: null,
-				productDescZh: null,
-				productModel:null,
-				productDescEn: null,
-				ruleCode: null,
-				oldProductCode: null,
-				partsProductCode: null,
-				skuBarcode: null,
-				length: null,
-				width: null,
-				height: null,
-				grossWeight: null,
-				netWeight: null,
-				tareWeight: null,
-				volume: null,
-				unitPrice: null,
-				productGroup: null,
-				productGroupName: null,
-				userDefined1: null,
-				userDefined2: null,
-				userDefined3: null,
-				userDefined4: null,
-				userDefined5: null,
-				userDefined6: null,
-				factoryCode: null,
-				activeFlag: null,
-				syncFlag: null,
-				primaryUom: null,
-				bstme: null,
-				basicOrder: null,
-				convOrder: null,
-				ausme: null,
-				basicIssue: null,
-				convIssue: null,
-				appendFlag: null,
-				appendPercent: null
-			},
-				options: [{
-        activeFlag: "1",
-        label: '是'
-        }, {
-        activeFlag: "0",
-        label: '否'
-        }],
-			// 表单参数
-			form: {},
-			// 表单校验
-			rules: {
-				productCode: [
-					{ required: true, message: "产品代码不能为空", trigger: "blur" }
-				],
-			}
-		};
-	},
-	created() {
-		this.getList();
-	},
-	methods: {
-		// 生成表头序号
-		indexMethod(index) {
-        return index + 1;
+  name: "Product",
+  dicts: ["sys_normal_disable", "material_type"],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 产品信息表格数据
+      productList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      openAttached: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        productCode: null,
+        productDescZh: null,
+        productModel: null,
+        productDescEn: null,
+        ruleCode: null,
+        oldProductCode: null,
+        partsProductCode: null,
+        skuBarcode: null,
+        length: null,
+        width: null,
+        height: null,
+        grossWeight: null,
+        netWeight: null,
+        tareWeight: null,
+        volume: null,
+        unitPrice: null,
+        productGroup: null,
+        productGroupName: null,
+        userDefined1: null,
+        userDefined2: null,
+        userDefined3: null,
+        userDefined4: null,
+        userDefined5: null,
+        userDefined6: null,
+        factoryCode: null,
+        activeFlag: null,
+        syncFlag: null,
+        primaryUom: null,
+        bstme: null,
+        basicOrder: null,
+        convOrder: null,
+        ausme: null,
+        basicIssue: null,
+        convIssue: null,
+        appendFlag: null,
+        appendPercent: null,
+      },
+      options: [
+        {
+          activeFlag: "1",
+          label: "是",
         },
-		/** 查询产品信息列表 */
-		getList() {
-			this.loading = true;
-			listProduct(this.queryParams).then(response => {
-				this.productList = response.rows;
-				this.total = response.total;
-				this.loading = false;
-			});
-		},
-		// 取消按钮
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		// 取消按钮
-		cancelAttached() {
-			this.openAttached = false;
-			this.reset();
-		},
-		// 表单重置
-		reset() {
-			this.form = {
-				productId: null,
-				productCode: null,
-				productDescZh: null,
-				productModel:null,
-				productDescEn: null,
-				ruleCode: null,
-				oldProductCode: null,
-				partsProductCode: null,
-				skuBarcode: null,
-				length: null,
-				width: null,
-				height: null,
-				grossWeight: null,
-				netWeight: null,
-				tareWeight: null,
-				volume: null,
-				unitPrice: null,
-				productGroup: null,
-				productGroupName: null,
-				userDefined1: null,
-				userDefined2: null,
-				userDefined3: null,
-				userDefined4: null,
-				userDefined5: null,
-				userDefined6: null,
-				createBy: null,
-				createTime: null,
-				updateBy: null,
-				updateTime: null,
-				factoryCode: null,
-				activeFlag: null,
-				syncFlag: null,
-				primaryUom: null,
-				delFlag: null,
-				bstme: null,
-				basicOrder: null,
-				convOrder: null,
-				ausme: null,
-				basicIssue: null,
-				convIssue: null,
-				appendFlag: null,
-				appendPercent: null
-			};
-			this.resetForm("form");
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNum = 1;
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm("queryForm");
-			this.handleQuery();
-		},
-		// 多选框选中数据
-		handleSelectionChange(selection) {
-			this.ids = selection.map(item => item.productId)
-			this.single = selection.length!==1
-			this.multiple = !selection.length
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = "添加产品信息";
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const productId = row.productId || this.ids
-			getProduct(productId).then(response => {
-				this.form = response.data;
-				this.open = true;
-				this.title = "修改产品信息";
-			});
-		},
+        {
+          activeFlag: "0",
+          label: "否",
+        },
+      ],
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        productCode: [
+          { required: true, message: "产品代码不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    // 生成表头序号
+    indexMethod(index) {
+      return index + 1;
+    },
+    /** 查询产品信息列表 */
+    getList() {
+      this.loading = true;
+      listProduct(this.queryParams).then((response) => {
+        this.productList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 取消按钮
+    cancelAttached() {
+      this.openAttached = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        productId: null,
+        productCode: null,
+        productDescZh: null,
+        productModel: null,
+        productDescEn: null,
+        ruleCode: null,
+        oldProductCode: null,
+        partsProductCode: null,
+        skuBarcode: null,
+        length: null,
+        width: null,
+        height: null,
+        grossWeight: null,
+        netWeight: null,
+        tareWeight: null,
+        volume: null,
+        unitPrice: null,
+        productGroup: null,
+        productGroupName: null,
+        userDefined1: null,
+        userDefined2: null,
+        userDefined3: null,
+        userDefined4: null,
+        userDefined5: null,
+        userDefined6: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        factoryCode: null,
+        activeFlag: null,
+        syncFlag: null,
+        primaryUom: null,
+        delFlag: null,
+        bstme: null,
+        basicOrder: null,
+        convOrder: null,
+        ausme: null,
+        basicIssue: null,
+        convIssue: null,
+        appendFlag: null,
+        appendPercent: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.productId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加产品信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const productId = row.productId || this.ids;
+      getProduct(productId).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改产品信息";
+      });
+    },
     // 查询明细按钮操作
-    handleView(row){
+    handleView(row) {
       this.reset();
-      const productId = row.productId || this.ids
-      getProduct(productId).then(response => {
-      	this.form = response.data;
-      	this.openAttached = true;
-      	this.title = "查看产品信息";
-     });
+      const productId = row.productId || this.ids;
+      getProduct(productId).then((response) => {
+        this.form = response.data;
+        this.openAttached = true;
+        this.title = "查看产品信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.productId != null) {
+            updateProduct(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addProduct(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const productIds = row.productId || this.ids;
+      this.$modal
+        .confirm(
+          '是否确认删除产品/物料信息编号为"' + productIds + '"的数据项？'
+        )
+        .then(function () {
+          return delProduct(productIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "wms/product/export",
+        {
+          ...this.queryParams,
+        },
+        `product_${new Date().getTime()}.xlsx`
+      );
     },
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs["form"].validate(valid => {
-				if (valid) {
-					if (this.form.productId != null) {
-						updateProduct(this.form).then(response => {
-							this.$modal.msgSuccess("修改成功");
-							this.open = false;
-							this.getList();
-						});
-					} else {
-						addProduct(this.form).then(response => {
-							this.$modal.msgSuccess("新增成功");
-							this.open = false;
-							this.getList();
-						});
-					}
-				}
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const productIds = row.productId || this.ids;
-			this.$modal.confirm('是否确认删除产品/物料信息编号为"' + productIds + '"的数据项？').then(function() {
-				return delProduct(productIds);
-			}).then(() => {
-				this.getList();
-				this.$modal.msgSuccess("删除成功");
-			}).catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			this.download('wms/product/export', {
-				...this.queryParams
-			}, `product_${new Date().getTime()}.xlsx`)
-		}
-	}
+  },
 };
 </script>