diff --git a/hb_client/src/views/inm/product.vue b/hb_client/src/views/inm/product.vue
index e6426cb..4e9da3c 100644
--- a/hb_client/src/views/inm/product.vue
+++ b/hb_client/src/views/inm/product.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-card>
       <el-button type="primary" icon="el-icon-plus" @click="handleorder"
-        >选择订单
+      >选择订单
       </el-button>
       <el-table
         v-loading="listLoading"
@@ -15,8 +15,8 @@
         height="100"
         v-el-height-adaptive-table="{bottomOffset: 42}"
       >
-        <el-table-column type="selection" width="55"> </el-table-column>
-        <el-table-column type="index" width="50" />
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column type="index" width="50"/>
         <el-table-column label="成品编号">
           <template slot-scope="scope">{{ scope.row.number }}</template>
         </el-table-column>
@@ -24,25 +24,18 @@
         <el-table-column label="成品批次">
           <template slot-scope="scope">{{ scope.row.batch }}</template>
         </el-table-column>
-        <el-table-column label="成品名称">
+        <el-table-column label="成品名称" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.material_.name }}</template>
         </el-table-column>
-
         <el-table-column label="所在仓库">
-          <template slot-scope="scope">{{
-            scope.row.warehouse_.name
-          }}</template>
+          <template slot-scope="scope">{{scope.row.warehouse_.name}}</template>
         </el-table-column>
 
         <el-table-column label="订单">
           <template slot-scope="scope">
-            <span v-if="scope.row.to_order_">{{
-              scope.row.to_order_.number
-            }}</span>
+            <span v-if="scope.row.to_order_">{{scope.row.to_order_.number}}</span>
             <el-tag
-              v-else-if="
-                scope.row.to_order_ == null && scope.row.need_to_order == true
-              "
+              v-else-if="scope.row.to_order_ == null && scope.row.need_to_order == true"
             >
               需要确定订单
             </el-tag>
@@ -51,13 +44,9 @@
         </el-table-column>
         <el-table-column label="合同">
           <template slot-scope="scope">
-            <span v-if="scope.row.to_order_">{{
-              scope.row.to_order_.contract_.name
-            }}</span>
+            <span v-if="scope.row.to_order_">{{scope.row.to_order_.contract_.name}}</span>
             <span
-              v-else-if="
-                scope.row.to_order_ == null && scope.row.need_to_order == true
-              "
+              v-else-if="scope.row.to_order_ == null && scope.row.need_to_order == true"
             >
             </span>
             <span v-else></span>
@@ -65,38 +54,33 @@
         </el-table-column>
         <el-table-column label="客户">
           <template slot-scope="scope">
-            <span v-if="scope.row.to_order_">{{
-              scope.row.to_order_.customer_.name
-            }}</span>
+            <span v-if="scope.row.to_order_">{{scope.row.to_order_.customer_.name}}</span>
             <span
-              v-else-if="
-                scope.row.to_order_ == null && scope.row.need_to_order == true
-              "
+              v-else-if="scope.row.to_order_ == null && scope.row.need_to_order == true"
             >
             </span>
             <span v-else></span>
           </template>
         </el-table-column>
-
         <el-table-column label="军检">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.is_mtestok == false">不合格</el-tag>
             <el-tag v-else-if="scope.row.is_mtestok == true">合格</el-tag>
-            <span v-else></span
-          ></template>
-        </el-table-column>
-       <!-- <el-table-column align="center" label="操作" width="220px">
-          <template slot-scope="scope">
-            <el-link
-              v-if="
-                checkPermission(['warehouse_update']) &&
-                scope.row.act_state == 30
-              "
-              @click="handleMtest(scope)"
-              >军检
-            </el-link>
+            <span v-else></span>
           </template>
-        </el-table-column>!-->
+        </el-table-column>
+        <!-- <el-table-column align="center" label="操作" width="220px">
+           <template slot-scope="scope">
+             <el-link
+               v-if="
+                 checkPermission(['warehouse_update']) &&
+                 scope.row.act_state == 30
+               "
+               @click="handleMtest(scope)"
+               >军检
+             </el-link>
+           </template>
+         </el-table-column>!-->
       </el-table>
       <pagination
         v-show="iproductData.count > 0"
@@ -112,8 +96,8 @@
           </el-form-item>
           <el-form-item label="军检备注" prop="name">
             <el-input
-              type="textarea"
               v-model="mtestform.remark_mtest"
+              type="textarea"
             ></el-input>
           </el-form-item>
         </el-form>
@@ -127,12 +111,11 @@
         :close-on-click-modal="false"
         :visible.sync="dialogFormVisibleorder"
       >
-     <el-descriptions :column="5" border style="margin-bottom: 20px">
-    <el-descriptions-item label="原订单">{{ this.ordershow }}</el-descriptions-item>
-    <el-descriptions-item label="原客户">{{ this.customershow }}</el-descriptions-item>
-    <el-descriptions-item label="原合同"  >{{ this.contractshow }}</el-descriptions-item>
-  </el-descriptions>
-        
+        <el-descriptions :column="5" border style="margin-bottom: 20px">
+          <el-descriptions-item label="原订单">{{ this.ordershow }}</el-descriptions-item>
+          <el-descriptions-item label="原客户">{{ this.customershow }}</el-descriptions-item>
+          <el-descriptions-item label="原合同">{{ this.contractshow }}</el-descriptions-item>
+        </el-descriptions>
         <el-table
           v-loading="listLoading"
           :data="orderList"
@@ -143,32 +126,28 @@
           height="100"
           v-el-height-adaptive-table="{ bottomOffset: 42 }"
         >
-          <el-table-column type="index" width="50" />
-
+          <el-table-column type="index" width="50"/>
           <el-table-column label="订单编号" width="160" show-overflow-tooltip>
             <template slot-scope="scope">{{ scope.row.number }}</template>
           </el-table-column>
           <el-table-column label="客户" width="200" show-overflow-tooltip>
-            <template slot-scope="scope">{{
-              scope.row.customer_.name
-            }}</template>
+            <template slot-scope="scope">{{scope.row.customer_.name}}
+            </template>
           </el-table-column>
           <el-table-column label="所属合同" width="200" show-overflow-tooltip>
-            <template slot-scope="scope" v-if="scope.row.contract">{{
-              scope.row.contract_.name
-            }}</template>
+            <template slot-scope="scope" v-if="scope.row.contract">{{scope.row.contract_.name}}
+            </template>
           </el-table-column>
           <el-table-column align="center" label="操作" width="120">
             <template slot-scope="scope">
               <el-link
                 v-if="checkPermission(['warehouse_update'])"
                 @click="toorders(scope)"
-                >确认
+              >确认
               </el-link>
             </template>
           </el-table-column>
         </el-table>
-
         <div slot="footer" class="dialog-footer">
           <el-button @click="dialogFormVisibleorder = false">取 消</el-button>
         </div>
@@ -177,111 +156,111 @@
   </div>
 </template>
 <script>
-import { getiproductList } from "@/api/inm";
-import checkPermission from "@/utils/permission";
-import { getOrderList } from "@/api/sam";
-import { mtest, toorder } from "@/api/wpm";
-import { genTree } from "@/utils";
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+  import {getiproductList} from "@/api/inm";
+  import checkPermission from "@/utils/permission";
+  import {getOrderList} from "@/api/sam";
+  import {mtest, toorder} from "@/api/wpm";
+  import {genTree} from "@/utils";
+  import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
 
-export default {
-  components: { Pagination },
-  data() {
-    return {
-      iproductData: {
-        count: 0,
-      },
-      listQuery: {
-        page: 1,
-        page_size: 20,
-      },
-      mtest: {},
-      salesdetail: "",
-      saleproduct: "",
-      dialogVisible: false,
-      mtestform: {
-        is_mtestok: false,
-      },
-      form1: {},
-      dialogFormVisibleorder: false,
-      orderList: [],
-      mutipID1: [],
-      mutipID: [],
-      mtmId: [],
-      ordershow: "",
-      customershow:"",
-      contractshow:"",
-      materialshow: [],
-    };
-  },
-  computed: {},
-  watch: {},
-  created() {
-    this.getList();
-  },
-  methods: {
-    checkPermission,
-    //半成品列表
-    getList() {
-      this.listLoading = true;
-      this.listQuery.material__type = 1;
-      this.listQuery.is_saled = false;
-      getiproductList(this.listQuery).then((response) => {
-        if (response.data) {
-          this.iproductData = response.data;
-        }
-        this.listLoading = false;
-      });
+  export default {
+    components: {Pagination},
+    data() {
+      return {
+        iproductData: {
+          count: 0,
+        },
+        listQuery: {
+          page: 1,
+          page_size: 20,
+        },
+        mtest: {},
+        salesdetail: "",
+        saleproduct: "",
+        dialogVisible: false,
+        mtestform: {
+          is_mtestok: false,
+        },
+        form1: {},
+        dialogFormVisibleorder: false,
+        orderList: [],
+        mutipID1: [],
+        mutipID: [],
+        mtmId: [],
+        ordershow: "",
+        customershow: "",
+        contractshow: "",
+        materialshow: [],
+      };
     },
-    handleMtest(scope) {
-      this.saleproduct = scope.row.id;
-      this.dialogVisible = true;
+    computed: {},
+    watch: {},
+    created() {
+      this.getList();
     },
-    submtest() {
-      mtest(this.saleproduct, this.mtestform).then((res) => {
-        if (res.code >= 200) {
-          this.$message.success("提交成功！");
-          this.dialogVisible = false;
-        }
-      });
-    },
-    //批量选择成品发给谋订单
-    handleorder() {
-      this.dialogFormVisibleorder = true;
-      let _this = this;
-      _this.mutipID1 = [];
-      _this.mtmId = [];
-      _this.materialshow = [];
-      this.$refs.multipleTable.selection.forEach((item) => {
-        _this.mutipID1.push(item.wproduct);
-        _this.mtmId.push(item.material_.id);
-         _this.materialshow.push(item);
-      });
-      this.ordershow = _this.materialshow[0].order_.number;
-      this.customershow=_this.materialshow[0].order_.customer_.name;
-       this.contractshow=_this.materialshow[0].order_.contract_.name;
-      getOrderList({ page: 0, material: _this.mtmId[0], tag:'not_done' }).then(
-        (response) => {
+    methods: {
+      checkPermission,
+      //半成品列表
+      getList() {
+        this.listLoading = true;
+        this.listQuery.material__type = 1;
+        this.listQuery.is_saled = false;
+        getiproductList(this.listQuery).then((response) => {
           if (response.data) {
-            this.orderList = response.data;
+            this.iproductData = response.data;
           }
           this.listLoading = false;
-        }
-      );
+        });
+      },
+      handleMtest(scope) {
+        this.saleproduct = scope.row.id;
+        this.dialogVisible = true;
+      },
+      submtest() {
+        mtest(this.saleproduct, this.mtestform).then((res) => {
+          if (res.code >= 200) {
+            this.$message.success("提交成功！");
+            this.dialogVisible = false;
+          }
+        });
+      },
+      //批量选择成品发给谋订单
+      handleorder() {
+        this.dialogFormVisibleorder = true;
+        let _this = this;
+        _this.mutipID1 = [];
+        _this.mtmId = [];
+        _this.materialshow = [];
+        this.$refs.multipleTable.selection.forEach((item) => {
+          _this.mutipID1.push(item.wproduct);
+          _this.mtmId.push(item.material_.id);
+          _this.materialshow.push(item);
+        });
+        this.ordershow = _this.materialshow[0].order_.number;
+        this.customershow = _this.materialshow[0].order_.customer_.name;
+        this.contractshow = _this.materialshow[0].order_.contract_.name;
+        getOrderList({page: 0, material: _this.mtmId[0], tag: 'not_done'}).then(
+          (response) => {
+            if (response.data) {
+              this.orderList = response.data;
+            }
+            this.listLoading = false;
+          }
+        );
+      },
+      //提交批量产品选择的订单
+      toorders(scope) {
+        toorder({
+          order: scope.row.id,
+          wproducts: this.mutipID1,
+        }).then((res) => {
+          if (res.code >= 200) {
+            this.$message.success("成功！");
+            this.dialogFormVisibleorder = false;
+            this.getList();
+          }
+        });
+      },
     },
-    //提交批量产品选择的订单
-    toorders(scope) {
-      toorder({
-        order: scope.row.id,
-        wproducts: this.mutipID1,
-      }).then((res) => {
-        if (res.code >= 200) {
-          this.$message.success("成功！");
-          this.dialogFormVisibleorder = false;
-          this.getList();
-        }
-      });
-    },
-  },
-};
+  };
 </script>
diff --git a/hb_client/src/views/mtm/materialdo.vue b/hb_client/src/views/mtm/materialdo.vue
index ec10a3f..306988d 100644
--- a/hb_client/src/views/mtm/materialdo.vue
+++ b/hb_client/src/views/mtm/materialdo.vue
@@ -79,26 +79,13 @@
                 <el-form-item label="表格名称" prop="name">
                   <el-input v-model="recordform.name" placeholder="表格名称"/>
                 </el-form-item>
-                <!--<el-form-item label="引用表单" prop="field_type">
-                  <el-select
-                    style="width: 100%"
-                    v-model="recordform.number"
-                    placeholder="请选择"
-                  >
-                    <el-option
-                      v-for="item in fieldtypeoptions"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>-->
                 <el-form-item label="表格类型" prop="formUsed">
                   <el-select
-                    style="width: 100%"
                     v-model="recordform.type"
+                    clearable
+                    style="width: 100%"
                     placeholder="请选择"
+                    @change="formTypeChange"
                   >
                     <el-option
                       v-for="item in typeOptions"
@@ -109,6 +96,22 @@
                     </el-option>
                   </el-select>
                 </el-form-item>
+                <el-form-item label="引用表单" prop="field_type">
+                  <el-select
+                    v-model="recordform.form"
+                    style="width: 100%"
+                    clearable
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="item in formList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
                 <el-form-item label="是否启用" prop="name">
                   <el-switch v-model="recordform.enabled"></el-switch>
                 </el-form-item>
@@ -576,6 +579,7 @@
         recordformList: {
           count: 0,
         },
+        formList:[],
         fieldList: {
           count: 0,
         },
@@ -696,6 +700,13 @@
       this.material = this.$route.params.id;
       this.recordformLists();
     },
+    mounted(){
+      getrecordformList({page:0}).then((response) => {
+        if (response.data) {
+          this.formList = response.data;
+        }
+      });
+    },
     methods: {
       formFunc(value) {
         this.dialogVisibleForm = value;
@@ -882,6 +893,13 @@
         //   this.$refs["Forms"].resetFields();
         // });
       },
+      formTypeChange(){
+        getrecordformList({type:this.recordform.type,page:0}).then((response) => {
+          if (response.data) {
+            this.formList = response.data;
+          }
+        });
+      },
       //新增字段
       handlefieldCreate() {
         this.field_choice = [""];
@@ -903,6 +921,8 @@
         });
       },
       handleEdit(scope) {
+        debugger;
+        console.log( scope.row);
         this.recordform = Object.assign({}, scope.row); // copy obj
         this.dialogType = "edit";
         this.dialogVisible = true;
@@ -959,6 +979,7 @@
             obj.type=this.recordform.type;
             obj.enabled=this.recordform.enabled;
             if (isEdit) {
+              obj.form=this.recordform.form?this.recordform.form:null;
               updaterecordform(this.recordform.id, obj).then(
                 (res) => {
                   if (res.code >= 200) {
@@ -970,6 +991,7 @@
               );
             } else {
               obj.material=parseInt(this.material);
+              obj.form=this.recordform.form!==''?this.recordform.form:null;
               createrecordform(obj).then((res) => {
                 if (res.code >= 200) {
                   this.recordformLists();
diff --git a/hb_client/src/views/procurement/vendor.vue b/hb_client/src/views/procurement/vendor.vue
index a40edb0..33b1e5a 100644
--- a/hb_client/src/views/procurement/vendor.vue
+++ b/hb_client/src/views/procurement/vendor.vue
@@ -2,33 +2,33 @@
   <div class="app-container">
     <el-card>
       <div>
-       
-      <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
-        >新增供应商</el-button >
-  
-      <el-input
-              v-model="listQuery.search"
-              placeholder="供应商名称"
-              style="width: 300px"
-              class="filter-item"
-              @keyup.enter.native="handleFilter"
-            />
-            <el-button
-              class="filter-item"
-              type="primary"
-              icon="el-icon-search"
-              @click="handleFilter"
-              >搜索</el-button
-            >
-            <el-button
-              class="filter-item"
-              type="primary"
-              icon="el-icon-refresh-left"
-              @click="resetFilter"
-              >重置</el-button
-            >
-    </div>
-    
+        <el-button type="primary" icon="el-icon-plus" @click="handleCreate">
+          新增供应商
+        </el-button>
+        <el-input
+          v-model="listQuery.search"
+          placeholder="供应商名称"
+          style="width: 300px"
+          class="filter-item"
+          @keyup.enter.native="handleFilter"
+        />
+        <el-button
+          class="filter-item"
+          type="primary"
+          icon="el-icon-search"
+          @click="handleFilter"
+        >
+          搜索
+        </el-button>
+        <el-button
+          class="filter-item"
+          type="primary"
+          icon="el-icon-refresh-left"
+          @click="resetFilter"
+        >
+          重置
+        </el-button>
+      </div>
     </el-card>
     <el-card style="margin-top: 2px">
       <el-table
@@ -39,31 +39,30 @@
         stripe
         highlight-current-row
         max-height="700"
-         height="100"
+        height="100"
         v-el-height-adaptive-table="{bottomOffset: 50}"
       >
-        <el-table-column type="index" width="50" />
+        <el-table-column type="index" width="50"/>
         <el-table-column label="供应商名">
           <template slot-scope="scope">{{ scope.row.name }}</template>
         </el-table-column>
-       
+
         <el-table-column label="联系人">
           <template slot-scope="scope">{{ scope.row.contact }}</template>
         </el-table-column>
         <el-table-column label="联系电话">
           <template slot-scope="scope">{{ scope.row.contact_phone }}</template>
         </el-table-column>
-        <el-table-column label="地址">
+        <el-table-column label="地址" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.address }}</template>
         </el-table-column>
-          <el-table-column label="供应物料">
+        <el-table-column label="供应物料">
           <template slot-scope="scope">{{ scope.row.material }}</template>
         </el-table-column>
-         
         <el-table-column label="备注">
           <template slot-scope="scope">{{ scope.row.description }}</template>
         </el-table-column>
-  <el-table-column label="创建时间">
+        <el-table-column label="创建时间" width="160">
           <template slot-scope="scope">{{ scope.row.create_time }}</template>
         </el-table-column>
         <el-table-column
@@ -72,19 +71,20 @@
           width="220px"
         >
           <template slot-scope="scope">
-           
             <el-link
               v-if="checkPermission(['vendor_update'])"
-                type="primary"
+              type="primary"
               @click="handleEdit(scope)"
-              >编辑</el-link
             >
+              编辑
+            </el-link>
             <el-link
               v-if="checkPermission(['vendor_delete'])"
               type="danger"
               @click="handleDelete(scope)"
-              >删除</el-link
             >
+              删除
+            </el-link>
           </template>
         </el-table-column>
       </el-table>
@@ -108,22 +108,20 @@
         :rules="rule1"
       >
         <el-form-item label="供应商名称" prop="name">
-          <el-input v-model="vendor.name" placeholder="供应商名称" />
+          <el-input v-model="vendor.name" placeholder="供应商名称"/>
         </el-form-item>
         <el-form-item label="联系人" prop="contact">
-          <el-input v-model="vendor.contact" placeholder="联系人" />
+          <el-input v-model="vendor.contact" placeholder="联系人"/>
         </el-form-item>
-         <el-form-item label="联系电话" prop="contact_phone">
-          <el-input v-model="vendor.contact_phone" placeholder="联系电话" />
+        <el-form-item label="联系电话" prop="contact_phone">
+          <el-input v-model="vendor.contact_phone" placeholder="联系电话"/>
         </el-form-item>
-        
-         <el-form-item label="地址" prop="address">
-          <el-input v-model="vendor.address" placeholder="地址" />
+        <el-form-item label="地址" prop="address">
+          <el-input v-model="vendor.address" placeholder="地址"/>
         </el-form-item>
-          <el-form-item label="供应物料" prop="material">
-          <el-input v-model="vendor.material" placeholder="供应物料" />
+        <el-form-item label="供应物料" prop="material">
+          <el-input v-model="vendor.material" placeholder="供应物料"/>
         </el-form-item>
-      
         <el-form-item label="备注" prop="description">
           <el-input
             type="textarea"
@@ -141,25 +139,25 @@
   </div>
 </template>
 <script>
-import { getpVendorList, createVendor,updateVendor,deleteVendor } from "@/api/vendor";
-import { getUserList } from "@/api/user";
-import checkPermission from "@/utils/permission";
+  import {getpVendorList, createVendor, updateVendor, deleteVendor} from "@/api/vendor";
+  import {getUserList} from "@/api/user";
+  import checkPermission from "@/utils/permission";
 
-import { genTree } from "@/utils";
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-const defaultvendor = {
-  name: "",
-  number: "",
-};
-export default {
-  components: { Pagination },
-  data() {
-    return {
-      vendor: defaultvendor,
-      vendorList: {
-        count: 0,
-      },
-      options: [{
+  import {genTree} from "@/utils";
+  import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+  const defaultvendor = {
+    name: "",
+    number: "",
+  };
+  export default {
+    components: {Pagination},
+    data() {
+      return {
+        vendor: defaultvendor,
+        vendorList: {
+          count: 0,
+        },
+        options: [{
           value: '0',
           label: '运转正常'
         }, {
@@ -169,110 +167,110 @@ export default {
           value: '2',
           label: '报废'
         }],
-      listQuery: {
-        page: 1,
-        page_size: 20,
-      },
-      keeperOptions:[],
-      listLoading: true,
-      dialogVisible: false,
-      dialogType: "new",
-      rule1: {
-        name: [{ required: true, message: "请输入", trigger: "blur" }],
-        number: [{ required: true, message: "请输入", trigger: "blur" }],
-        model: [{ required: true, message: "请输入", trigger: "blur" }],
-        state: [{ required: true, message: "请选择", trigger: "blur" }],
-      },
-    };
-  },
-  computed: {},
-  watch: {},
-  created() {
-    this.getList();
-  },
-  methods: {
-    checkPermission,
-    //供应商列表
-    getList() {
-      this.listLoading = true;
-      getpVendorList(this.listQuery).then((response) => {
-        if (response.data) {
-          this.vendorList = response.data;
-        }
-        this.listLoading = false;
-      });
+        listQuery: {
+          page: 1,
+          page_size: 20,
+        },
+        keeperOptions: [],
+        listLoading: true,
+        dialogVisible: false,
+        dialogType: "new",
+        rule1: {
+          name: [{required: true, message: "请输入", trigger: "blur"}],
+          number: [{required: true, message: "请输入", trigger: "blur"}],
+          model: [{required: true, message: "请输入", trigger: "blur"}],
+          state: [{required: true, message: "请选择", trigger: "blur"}],
+        },
+      };
     },
-   
-    handleFilter() {
-      this.listQuery.page = 1;
+    computed: {},
+    watch: {},
+    created() {
       this.getList();
     },
-    resetFilter() {
-      this.listQuery = {
-        page: 1,
-        page_size: 20,
-      }
-      this.getList();
-    },
-    handleCreate() {
-      this.vendor = Object.assign({}, defaultvendor);
-      this.dialogType = "new";
-      this.dialogVisible = true;
-      this.$nextTick(() => {
-        this.$refs["Form"].clearValidate();
-      });
-    },
-   
-    handleEdit(scope) {
-      this.vendor = Object.assign({}, scope.row); // copy obj
-      this.dialogType = "edit";
-      this.dialogVisible = true;
-      this.$nextTick(() => {
-        this.$refs["Form"].clearValidate();
-      });
-    },
-    handleDelete(scope) {
-      this.$confirm("确认删除?", "警告", {
-        confirmButtonText: "确认",
-        cancelButtonText: "取消",
-        type: "error",
-      })
-        .then(async () => {
-          await deleteVendor(scope.row.id);
-          this.getList();
-          this.$message.success("成功");
-        })
-        .catch((err) => {
-          console.error(err);
-        });
-    },
-   
-    async confirm(form) {
-      this.$refs[form].validate((valid) => {
-        if (valid) {
-          const isEdit = this.dialogType === "edit";
-          if (isEdit) {
-            updateVendor(this.vendor.id, this.vendor).then((res) => {
-              if (res.code >= 200) {
-                this.getList();
-                this.dialogVisible = false;
-                this.$message.success("成功");
-              }
-            });
-          } else {
-            createVendor(this.vendor).then((res) => {
-              if (res.code >= 200) {
-                this.getList();
-                 this.dialogVisible = false;
-                this.$message.success("成功");
-              }
-            });
+    methods: {
+      checkPermission,
+      //供应商列表
+      getList() {
+        this.listLoading = true;
+        getpVendorList(this.listQuery).then((response) => {
+          if (response.data) {
+            this.vendorList = response.data;
           }
-        } else {
-          return false;
+          this.listLoading = false;
+        });
+      },
+
+      handleFilter() {
+        this.listQuery.page = 1;
+        this.getList();
+      },
+      resetFilter() {
+        this.listQuery = {
+          page: 1,
+          page_size: 20,
         }
-      });
+        this.getList();
+      },
+      handleCreate() {
+        this.vendor = Object.assign({}, defaultvendor);
+        this.dialogType = "new";
+        this.dialogVisible = true;
+        this.$nextTick(() => {
+          this.$refs["Form"].clearValidate();
+        });
+      },
+
+      handleEdit(scope) {
+        this.vendor = Object.assign({}, scope.row); // copy obj
+        this.dialogType = "edit";
+        this.dialogVisible = true;
+        this.$nextTick(() => {
+          this.$refs["Form"].clearValidate();
+        });
+      },
+      handleDelete(scope) {
+        this.$confirm("确认删除?", "警告", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+          type: "error",
+        })
+          .then(async () => {
+            await deleteVendor(scope.row.id);
+            this.getList();
+            this.$message.success("成功");
+          })
+          .catch((err) => {
+            console.error(err);
+          });
+      },
+
+      async confirm(form) {
+        this.$refs[form].validate((valid) => {
+          if (valid) {
+            const isEdit = this.dialogType === "edit";
+            if (isEdit) {
+              updateVendor(this.vendor.id, this.vendor).then((res) => {
+                if (res.code >= 200) {
+                  this.getList();
+                  this.dialogVisible = false;
+                  this.$message.success("成功");
+                }
+              });
+            } else {
+              createVendor(this.vendor).then((res) => {
+                if (res.code >= 200) {
+                  this.getList();
+                  this.dialogVisible = false;
+                  this.$message.success("成功");
+                }
+              });
+            }
+          } else {
+            return false;
+          }
+        });
+      },
     },
-  },
-};
+  };
 </script>
diff --git a/hb_client/src/views/qm/processtest.vue b/hb_client/src/views/qm/processtest.vue
index 16376a5..a4f85eb 100644
--- a/hb_client/src/views/qm/processtest.vue
+++ b/hb_client/src/views/qm/processtest.vue
@@ -15,56 +15,56 @@
             <el-table-column label="任务编号" align="center">
               <template slot-scope="scope">{{ scope.row.number }}</template>
             </el-table-column>
-            <el-table-column label="产品名称" align="center">
+            <el-table-column label="产品名称" align="center" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.product_.name }}</template>
             </el-table-column>
             <el-table-column label="规格型号" align="center">
-              <template slot-scope="scope">{{
-                scope.row.product_.specification
-              }}</template>
+              <template slot-scope="scope">
+                {{scope.row.product_.specification }}
+              </template>
             </el-table-column>
             <el-table-column label="合格率" align="center">
               <el-table-column label="冷加工" align="center">
-                <template slot-scope="scope" v-if="scope.row.process_json['01']"
-                  >{{ scope.row.process_json["01"].rate }}%</template
-                >
+                <template slot-scope="scope" v-if="scope.row.process_json['01']">
+                  {{ scope.row.process_json["01"].rate }}%
+                </template>
               </el-table-column>
               <el-table-column label="热弯" align="center">
-                <template slot-scope="scope" v-if="scope.row.process_json['02']"
-                  >{{ scope.row.process_json["02"].rate }}%</template
-                >
+                <template slot-scope="scope" v-if="scope.row.process_json['02']">
+                  {{ scope.row.process_json["02"].rate }}%
+                </template>
               </el-table-column>
               <el-table-column label="化学钢化" align="center">
-                <template slot-scope="scope" v-if="scope.row.process_json['03']"
-                  >{{ scope.row.process_json["03"].rate }}%</template
-                >
+                <template slot-scope="scope" v-if="scope.row.process_json['03']">
+                  {{ scope.row.process_json["03"].rate }}%
+                </template>
               </el-table-column>
               <el-table-column label="镀膜" align="center">
-                <template slot-scope="scope" v-if="scope.row.process_json['05']"
-                  >{{ scope.row.process_json["05"].rate }}%</template
-                >
+                <template slot-scope="scope" v-if="scope.row.process_json['05']">
+                  {{ scope.row.process_json["05"].rate }}%
+                </template>
               </el-table-column>
               <el-table-column label="夹层" align="center">
-                <template slot-scope="scope" v-if="scope.row.process_json['06']"
-                  >{{ scope.row.process_json["06"].rate }}%</template
-                >
+                <template slot-scope="scope" v-if="scope.row.process_json['06']">
+                  {{ scope.row.process_json["06"].rate }}%
+                </template>
               </el-table-column>
               <el-table-column label="包边" align="center">
-                <template slot-scope="scope" v-if="scope.row.process_json['07']"
-                  >{{ scope.row.process_json["07"].rate }}%</template
-                >
+                <template slot-scope="scope" v-if="scope.row.process_json['07']">
+                  {{ scope.row.process_json["07"].rate }}%
+                </template>
               </el-table-column>
               <el-table-column label="装框" align="center">
-                <template slot-scope="scope" v-if="scope.row.process_json['08']"
-                  >{{ scope.row.process_json["08"].rate }}%</template
-                >
+                <template slot-scope="scope" v-if="scope.row.process_json['08']">
+                  {{ scope.row.process_json["08"].rate }}%
+                </template>
               </el-table-column>
             </el-table-column>
-            <el-table-column label="创建时间" align="center">
-              <template slot-scope="scope">{{
-                scope.row.create_time
-              }}</template>
+            <el-table-column label="创建时间" align="center" min-width="150" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.create_time }}
+              </template>
             </el-table-column>
             <el-table-column label="操作" align="center">
               <template slot-scope="scope">
@@ -72,8 +72,9 @@
                   v-if="checkPermission(['material_update'])"
                   type="primary"
                   @click="handledetail(scope)"
-                  >详情</el-link
                 >
+                  详情
+                </el-link>
               </template>
             </el-table-column>
           </el-table>
@@ -100,34 +101,34 @@
               <template slot-scope="scope">{{ scope.row.number }}</template>
             </el-table-column>
             <el-table-column label="订单编号">
-              <template slot-scope="scope" v-if="scope.row.order_">{{
-                scope.row.order_.number
-              }}</template>
+              <template slot-scope="scope" v-if="scope.row.order_">
+                {{scope.row.order_.number}}
+              </template>
             </el-table-column>
-            <el-table-column label="产品名称">
-              <template slot-scope="scope" v-if="scope.row.product_">{{
-                scope.row.product_.name
-              }}</template>
+            <el-table-column label="产品名称" min-width="110" show-overflow-tooltip>
+              <template slot-scope="scope" v-if="scope.row.product_">
+                {{scope.row.product_.name}}
+              </template>
             </el-table-column>
             <el-table-column label="规格型号">
-              <template slot-scope="scope" v-if="scope.row.product_">{{
-                scope.row.product_.specification
-              }}</template>
+              <template slot-scope="scope" v-if="scope.row.product_">
+                {{scope.row.product_.specification}}
+              </template>
             </el-table-column>
             <el-table-column label="责任工序">
-              <template slot-scope="scope" v-if="scope.row.resp_process_">{{
-                scope.row.resp_process_.name
-              }}</template>
+              <template slot-scope="scope" v-if="scope.row.resp_process_">
+                {{scope.row.resp_process_.name}}
+              </template>
             </el-table-column>
             <el-table-column label="处理结果">
-              <template slot-scope="scope">{{
-                decision_[scope.row.decision]
-              }}</template>
+              <template slot-scope="scope">
+                {{decision_[scope.row.decision]}}
+              </template>
             </el-table-column>
-            <el-table-column label="创建时间">
-              <template slot-scope="scope">{{
-                scope.row.create_time
-              }}</template>
+            <el-table-column label="创建时间" min-width="150" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.create_time}}
+              </template>
             </el-table-column>
             <el-table-column label="操作">
               <template slot-scope="scope">
@@ -135,8 +136,9 @@
                   v-if="checkPermission(['material_update'])"
                   type="primary"
                   @click="handledetailbhg(scope)"
-                  >查看</el-link
                 >
+                  查看
+                </el-link>
               </template>
             </el-table-column>
           </el-table>
@@ -147,7 +149,6 @@
             :limit.sync="listQuery2.page_size"
             @pagination="getList2"
           />
-       
         </el-tab-pane>
       </el-tabs>
     </el-card>
diff --git a/hb_client/src/views/qm/producttest.vue b/hb_client/src/views/qm/producttest.vue
index cb3a7d3..33675b0 100644
--- a/hb_client/src/views/qm/producttest.vue
+++ b/hb_client/src/views/qm/producttest.vue
@@ -17,7 +17,7 @@
           <template slot-scope="scope" v-if="scope.row.subproduction_plan_">{{ scope.row.subproduction_plan_.number }}
           </template>
         </el-table-column>
-        <el-table-column label="产品名称">
+        <el-table-column label="产品名称" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope" v-if="scope.row.material_">{{ scope.row.material_.name }}</template>
         </el-table-column>
         <el-table-column label="型号规格">
diff --git a/hb_client/src/views/qm/unproduct.vue b/hb_client/src/views/qm/unproduct.vue
index 38d07ad..f1e3516 100644
--- a/hb_client/src/views/qm/unproduct.vue
+++ b/hb_client/src/views/qm/unproduct.vue
@@ -3,65 +3,65 @@
     <el-card style="margin-top: 2px">
       <el-tabs v-model="activeName" type="card">
         <el-tab-pane label="成品不合格" name="1">
-       <el-table
-        :data="wproductList.results"
-        border
-        fit
-        stripe
-        highlight-current-row
-        max-height="600"
-      >
-        <el-table-column type="index" label="序号" width="50"/>
-        <el-table-column label="产品编号">
-          <template slot-scope="scope">{{ scope.row.number }}</template>
-        </el-table-column>
-        <el-table-column label="任务编号">
-          <template slot-scope="scope" v-if="scope.row.subproduction_plan_">{{ scope.row.subproduction_plan_.number }}
-          </template>
-        </el-table-column>
-        <el-table-column label="产品名称">
-          <template slot-scope="scope" v-if="scope.row.material_">{{ scope.row.material_.name }}</template>
-        </el-table-column>
-        <el-table-column label="型号规格">
-          <template slot-scope="scope" v-if="scope.row.material_">{{ scope.row.material_.specification }}</template>
-        </el-table-column>
-       
-        <el-table-column label="军检结论">
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.is_mtestok==false">不合格</el-tag>
-            <el-tag v-if="scope.row.is_mtestok==true">合格</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="仓库">
-          <template slot-scope="scope" v-if="scope.row.warehouse_">{{ scope.row.warehouse_.name }}</template>
-        </el-table-column>
-        <el-table-column label="检查表">
-          <template slot-scope="scope">{{ scope.row.number }}</template>
-        </el-table-column>
-        <el-table-column label="检查状态">
-          <template slot-scope="scope">{{ actstate_[scope.row.act_state]}}</template>
-        </el-table-column>
-        <el-table-column align="center" label="操作" width="220px">
-          <template slot-scope="scope">
-            <el-link
-              v-if="checkPermission(['warehouse_update'])&&scope.row.act_state==30&&scope.row.is_mtested==false"
-              @click="handleMtest(scope)"
-            >军检
-            </el-link>
-            <el-link
-              @click="checkRecord(scope)"
-            >检验记录
-            </el-link>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-show="wproductList.count > 0"
-        :total="wproductList.count"
-        :page.sync="listQuery.page"
-        :limit.sync="listQuery.page_size"
-        @pagination="getList"
-      />
+          <el-table
+            :data="wproductList.results"
+            border
+            fit
+            stripe
+            highlight-current-row
+            max-height="600"
+          >
+            <el-table-column type="index" label="序号" width="50"/>
+            <el-table-column label="产品编号">
+              <template slot-scope="scope">{{ scope.row.number }}</template>
+            </el-table-column>
+            <el-table-column label="任务编号">
+              <template slot-scope="scope" v-if="scope.row.subproduction_plan_">
+                {{ scope.row.subproduction_plan_.number}}
+              </template>
+            </el-table-column>
+            <el-table-column label="产品名称" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope" v-if="scope.row.material_">{{ scope.row.material_.name }}</template>
+            </el-table-column>
+            <el-table-column label="型号规格">
+              <template slot-scope="scope" v-if="scope.row.material_">{{ scope.row.material_.specification }}</template>
+            </el-table-column>
+            <el-table-column label="军检结论">
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.is_mtestok==false">不合格</el-tag>
+                <el-tag v-if="scope.row.is_mtestok==true">合格</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="仓库">
+              <template slot-scope="scope" v-if="scope.row.warehouse_">{{ scope.row.warehouse_.name }}</template>
+            </el-table-column>
+            <el-table-column label="检查表">
+              <template slot-scope="scope">{{ scope.row.number }}</template>
+            </el-table-column>
+            <el-table-column label="检查状态">
+              <template slot-scope="scope">{{ actstate_[scope.row.act_state]}}</template>
+            </el-table-column>
+            <el-table-column align="center" label="操作" width="220px">
+              <template slot-scope="scope">
+                <el-link
+                  v-if="checkPermission(['warehouse_update'])&&scope.row.act_state==30&&scope.row.is_mtested==false"
+                  @click="handleMtest(scope)"
+                >军检
+                </el-link>
+                <el-link
+                  @click="checkRecord(scope)"
+                >检验记录
+                </el-link>
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination
+            v-show="wproductList.count > 0"
+            :total="wproductList.count"
+            :page.sync="listQuery.page"
+            :limit.sync="listQuery.page_size"
+            @pagination="getList"
+          />
         </el-tab-pane>
         <el-tab-pane label="过程不合格品" name="2">
           <el-table
@@ -73,39 +73,39 @@
             height="620"
             v-el-height-adaptive-table="{ bottomOffset: 40 }"
           >
-            <el-table-column type="index" width="50" />
+            <el-table-column type="index" width="50"/>
             <el-table-column label="玻璃编号">
               <template slot-scope="scope">{{ scope.row.number }}</template>
             </el-table-column>
             <el-table-column label="订单编号">
-              <template slot-scope="scope" v-if="scope.row.order_">{{
-                scope.row.order_.number
-              }}</template>
+              <template slot-scope="scope" v-if="scope.row.order_">
+                {{scope.row.order_.number}}
+              </template>
             </el-table-column>
-            <el-table-column label="产品名称">
-              <template slot-scope="scope" v-if="scope.row.product_">{{
-                scope.row.product_.name
-              }}</template>
+            <el-table-column label="产品名称" min-width="120" show-overflow-tooltip>
+              <template slot-scope="scope" v-if="scope.row.product_">
+                {{scope.row.product_.name}}
+              </template>
             </el-table-column>
             <el-table-column label="规格型号">
-              <template slot-scope="scope" v-if="scope.row.product_">{{
-                scope.row.product_.specification
-              }}</template>
+              <template slot-scope="scope" v-if="scope.row.product_">
+                {{scope.row.product_.specification}}
+              </template>
             </el-table-column>
             <el-table-column label="责任工序">
-              <template slot-scope="scope" v-if="scope.row.resp_process_">{{
-                scope.row.resp_process_.name
-              }}</template>
+              <template slot-scope="scope" v-if="scope.row.resp_process_">
+                {{scope.row.resp_process_.name}}
+              </template>
             </el-table-column>
             <el-table-column label="处理结果">
-              <template slot-scope="scope">{{
-                decision_[scope.row.decision]
-              }}</template>
+              <template slot-scope="scope">
+                {{decision_[scope.row.decision]}}
+              </template>
             </el-table-column>
             <el-table-column label="创建时间">
-              <template slot-scope="scope">{{
-                scope.row.create_time
-              }}</template>
+              <template slot-scope="scope">
+                {{scope.row.create_time}}
+              </template>
             </el-table-column>
             <el-table-column label="操作">
               <template slot-scope="scope">
@@ -113,8 +113,9 @@
                   v-if="checkPermission(['material_update'])"
                   type="primary"
                   @click="handledetailbhg(scope)"
-                  >查看</el-link
                 >
+                  查看
+                </el-link>
               </template>
             </el-table-column>
           </el-table>
@@ -125,68 +126,68 @@
             :limit.sync="listQuery2.page_size"
             @pagination="getList2"
           />
-       
         </el-tab-pane>
-         <el-tab-pane label="入厂不合格" name="4">
-       <el-table
-        v-loading="listLoading"
-        :data="fifodetailList4.results"
-        border
-        fit
-        stripe
-        highlight-current-row
-       height="620"
-         v-el-height-adaptive-table="{bottomOffset: 40}"
-      >
-        <el-table-column type="index" width="50" />
-         <el-table-column label="物料批次">
-          <template slot-scope="scope">{{ scope.row.batch }}</template>
-        </el-table-column>
-        <el-table-column label="物料名称">
-          <template slot-scope="scope">{{ scope.row.material_.name }}</template>
-        </el-table-column>
-  <el-table-column label="规格型号">
-          <template slot-scope="scope">{{
-            scope.row.material_.specification
-          }}</template>
-        </el-table-column>
-         <el-table-column label="物料单位">
-          <template slot-scope="scope">{{ scope.row.material_.unit }}</template>
-        </el-table-column>
-    
-  <el-table-column label="创建时间">
-          <template slot-scope="scope">{{ scope.row.create_time }}</template>
-        </el-table-column>
-      
-      </el-table>
-      <pagination
-        v-show="fifodetailList4.count > 0"
-        :total="fifodetailList4.count"
-        :page.sync="listQuery4.page"
-        :limit.sync="listQuery4.page_size"
-        @pagination="getList4"
-      />
-    </el-tab-pane>
+        <el-tab-pane label="入厂不合格" name="4">
+          <el-table
+            v-loading="listLoading"
+            :data="fifodetailList4.results"
+            border
+            fit
+            stripe
+            highlight-current-row
+            height="620"
+            v-el-height-adaptive-table="{bottomOffset: 40}"
+          >
+            <el-table-column type="index" width="50"/>
+            <el-table-column label="物料批次">
+              <template slot-scope="scope">{{ scope.row.batch }}</template>
+            </el-table-column>
+            <el-table-column label="物料名称">
+              <template slot-scope="scope">{{ scope.row.material_.name }}</template>
+            </el-table-column>
+            <el-table-column label="规格型号">
+              <template slot-scope="scope">{{
+                scope.row.material_.specification
+                }}
+              </template>
+            </el-table-column>
+            <el-table-column label="物料单位">
+              <template slot-scope="scope">{{ scope.row.material_.unit }}</template>
+            </el-table-column>
+
+            <el-table-column label="创建时间">
+              <template slot-scope="scope">{{ scope.row.create_time }}</template>
+            </el-table-column>
+
+          </el-table>
+          <pagination
+            v-show="fifodetailList4.count > 0"
+            :total="fifodetailList4.count"
+            :page.sync="listQuery4.page"
+            :limit.sync="listQuery4.page_size"
+            @pagination="getList4"
+          />
+        </el-tab-pane>
       </el-tabs>
     </el-card>
   </div>
 </template>
 <script>
-import { getProductionplanList } from "@/api/pm";
-import { getwproductticketList,getwproductList } from "@/api/wpm";
-import { ticketread } from "@/api/workflow";
-import {  getfifodetailList} from "@/api/inm";
-import checkPermission from "@/utils/permission";
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+  import {getProductionplanList} from "@/api/pm";
+  import {getwproductticketList, getwproductList} from "@/api/wpm";
+  import {ticketread} from "@/api/workflow";
+  import {getfifodetailList} from "@/api/inm";
+  import checkPermission from "@/utils/permission";
+  import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
 
-export default {
-  components: { Pagination },
-  data() {
-    return {
-     wproductList: {
-        count: 0,
-      },
-       actstate_: {
+  export default {
+    components: {Pagination},
+    data() {
+      return {
+        wproductList: {
+          count: 0,
+        },
+        actstate_: {
           6: "待复检",
           10: "操作进行中",
           20: "待检验",
@@ -198,93 +199,92 @@ export default {
           26: "待夹层检验",
           70: "报废",
         },
-       listQuery: {
-        page: 1,
-        page_size: 20,
-      },
+        listQuery: {
+          page: 1,
+          page_size: 20,
+        },
         wproductticket: {
-        count: 0,
-      },
-    
-      listQuery2: {
-        page: 1,
-        page_size: 20,
-      },
-       customfieldList: [],
-         activeName: "1",
+          count: 0,
+        },
+
+        listQuery2: {
+          page: 1,
+          page_size: 20,
+        },
+        customfieldList: [],
+        activeName: "1",
         decision_: {
-        10: "返工",
-        20: "返修",
-        30: "报废",
-        40: "让步接受",
-        50: "偏离许可",
-        60: "降级使用",
-        70: "退回供方",
-        80: "召回",
-      },
-       listQuery4: {
-        page: 1,
-        page_size: 20,
-      },
-       fifodetailList4:{
-        count: 0,
-      },
-    };
-  },
-  computed: {},
-  watch: {},
-  created() {
-    this.getList(); //成品不合格
-    this.getList2(); //过程
-    this.getList4();//入场不合格
-  },
-  methods: {
-    checkPermission,
-    //不合格成品
-   
-     getList() {
-      this.listLoading = true;
-     
-     
+          10: "返工",
+          20: "返修",
+          30: "报废",
+          40: "让步接受",
+          50: "偏离许可",
+          60: "降级使用",
+          70: "退回供方",
+          80: "召回",
+        },
+        listQuery4: {
+          page: 1,
+          page_size: 20,
+        },
+        fifodetailList4: {
+          count: 0,
+        },
+      };
+    },
+    computed: {},
+    watch: {},
+    created() {
+      this.getList(); //成品不合格
+      this.getList2(); //过程
+      this.getList4();//入场不合格
+    },
+    methods: {
+      checkPermission,
+      //不合格成品
+
+      getList() {
+        this.listLoading = true;
+
+
         this.listQuery.material__type = 1;
-         this.listQuery.tag='notok';
+        this.listQuery.tag = 'notok';
         getwproductList(this.listQuery).then((response) => {
           if (response.data) {
             this.wproductList = response.data;
           }
         });
-   
-    },
 
-    //不合格玻璃审批工单列表
-    getList2() {
-      getwproductticketList(this.listQuery2).then((response) => {
-        if (response.data) {
-          this.wproductticket = response.data;
-        }
-      });
-    },
-    //不合格玻璃审理单查看
-    handledetailbhg(scope)
-    {
-      
-        this.$router.push({name:"ticketDetail",params:{ticketId:scope.row.ticket}})
-    },
-    //入场检验不合格
-     //不合格物料
+      },
+
+      //不合格玻璃审批工单列表
+      getList2() {
+        getwproductticketList(this.listQuery2).then((response) => {
+          if (response.data) {
+            this.wproductticket = response.data;
+          }
+        });
+      },
+      //不合格玻璃审理单查看
+      handledetailbhg(scope) {
+
+        this.$router.push({name: "ticketDetail", params: {ticketId: scope.row.ticket}})
+      },
+      //入场检验不合格
+      //不合格物料
       getList4() {
-      this.listLoading = true;
-       this.listQuery4.fifo__type = 3;
-      this.listQuery4.is_testok = false;
-      this.listQuery4.is_tested = true;
-      getfifodetailList(this.listQuery4).then((response) => {
-        if (response.data) {
-          this.fifodetailList4 = response.data;
-        }
-        this.listLoading = false;
-      });
+        this.listLoading = true;
+        this.listQuery4.fifo__type = 3;
+        this.listQuery4.is_testok = false;
+        this.listQuery4.is_tested = true;
+        getfifodetailList(this.listQuery4).then((response) => {
+          if (response.data) {
+            this.fifodetailList4 = response.data;
+          }
+          this.listLoading = false;
+        });
+      },
+
     },
-   
-  },
-};
+  };
 </script>