From ffb7b6ece2babf494d01ed6def9d319f084091bd Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 18 Feb 2022 10:51:10 +0800
Subject: [PATCH] styleAdjust

---
 hb_client/src/api/hrm.js                      |    7 +
 hb_client/src/views/bigScreen/index.vue       |   13 +
 hb_client/src/views/dashboard/index.vue       |   10 +-
 hb_client/src/views/mtm/process.vue           |  433 +++---
 hb_client/src/views/pm/plan.vue               |   32 +-
 .../views/statistics/materialStatistics.vue   |   10 +-
 .../views/statistics/progressStatistics.vue   |   10 +-
 hb_client/src/views/wpm/worktask.vue          | 1160 ++++++++---------
 8 files changed, 837 insertions(+), 838 deletions(-)

diff --git a/hb_client/src/api/hrm.js b/hb_client/src/api/hrm.js
index beca22f..e3378a4 100644
--- a/hb_client/src/api/hrm.js
+++ b/hb_client/src/api/hrm.js
@@ -13,3 +13,10 @@ export function clockRecord(data) {
     data
   })
 }
+export function getEmployee(data) {
+  return request({
+    url: '/hrm/employee/',
+    method: 'get',
+    data
+  })
+}
diff --git a/hb_client/src/views/bigScreen/index.vue b/hb_client/src/views/bigScreen/index.vue
index d07274d..2a0fcf1 100644
--- a/hb_client/src/views/bigScreen/index.vue
+++ b/hb_client/src/views/bigScreen/index.vue
@@ -98,6 +98,7 @@
   import center from './center'
   import bottomLeft from './bottomLeft'
   import bottomRight from './bottomRight'
+  import { getPlanGantt } from "@/api/srm";
 
   export default {
     mixins: [ drawMixin ],
@@ -108,6 +109,7 @@
         dateDay: null,
         dateYear: null,
         dateWeek: null,
+        planGanttList:[],
         weekday: ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
       }
     },
@@ -122,6 +124,7 @@
     mounted() {
       this.timeFn();
       this.cancelLoading();
+      this.getPageData();
       let bigHeight = document.getElementsByClassName('host-body')[0].clientHeight;
       let firstHeight = document.getElementById('firstLine').clientHeight;
       let secondHeight = document.getElementsByClassName('jc-between')[0].clientHeight;
@@ -139,6 +142,16 @@
           this.dateWeek = this.weekday[new Date().getDay()]
         }, 1000)
       },
+      getPageData(){
+        let that = this;
+        getPlanGantt({Authorization:'big_screen'}).then(res => {
+          if (res.code === 200) {
+            this.planGanttList = res.data.results;
+          } else {
+            that.$message.error(res.msg);
+          }
+        })
+      },
       cancelLoading() {
         setTimeout(() => {
           this.loading = false
diff --git a/hb_client/src/views/dashboard/index.vue b/hb_client/src/views/dashboard/index.vue
index dcac59e..74b0ecc 100644
--- a/hb_client/src/views/dashboard/index.vue
+++ b/hb_client/src/views/dashboard/index.vue
@@ -240,7 +240,8 @@
                   </el-tag>
                 </template>
               </el-table-column>
-              <el-table-column label="部门" prop="dept_name">
+              <el-table-column label="部门" prop="dept_">
+                <template slot-scope="scope">{{scope.row.dept_.name}}</template>
               </el-table-column>
             </el-table>
           </div>
@@ -338,7 +339,8 @@
 <script>
   import echarts from 'echarts'
   import {mapGetters} from 'vuex';
-  import {getUserList} from "@/api/user";
+  // import {getUserList} from "@/api/user";
+  import {getEmployee} from "@/api/hrm";
   import {getMaterialList} from "@/api/mtm";
   import {getProductionplanList} from "@/api/pm";
   import {getmaterialbatchList} from "@/api/inm";
@@ -586,7 +588,7 @@
         let that = this;
         that.listLoadingUser = true;
         that.userPage =1;
-        getUserList({page: that.userPage, page_size: that.userPageSize, fields: 'id,name,dept_name,is_atwork'}).then((response) => {
+        getEmployee({page: that.userPage, page_size: that.userPageSize}).then((response) => {
           if (response.data) {
             that.userList = response.data.results;
             that.userTotal = response.data.count;
@@ -600,7 +602,7 @@
         let that = this;
         that.listLoadingUser = true;
         that.userPage = val;
-        getUserList({page: val, page_size: that.userPageSize, fields: 'id,name,dept_name,is_atwork'}).then((response) => {
+        getEmployee({page: val, page_size: that.userPageSize, fields: 'id,name,dept_name,is_atwork'}).then((response) => {
           if (response.data) {
             that.userList = response.data.results;
             that.userTotal = response.data.count;
diff --git a/hb_client/src/views/mtm/process.vue b/hb_client/src/views/mtm/process.vue
index 8d52cd9..75d69ca 100644
--- a/hb_client/src/views/mtm/process.vue
+++ b/hb_client/src/views/mtm/process.vue
@@ -1,12 +1,11 @@
 <template>
   <div class="app-container">
     <el-card>
-        
-    <div style="margin-top: 2px">
-      <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
-        >新增工序</el-button
-      >
-    </div>
+      <div style="margin-top: 2px">
+        <el-button type="primary" icon="el-icon-plus" @click="handleCreate">
+          新增工序
+        </el-button>
+      </div>
     </el-card>
     <el-card style="margin-top: 2px">
       <el-table
@@ -15,29 +14,29 @@
         border
         fit
         stripe
-      max-height="620"
-         height="100"
+        max-height="620"
+        height="100"
         v-el-height-adaptive-table="{bottomOffset: 10}"
       >
-        <el-table-column type="index" width="50" />
-          <el-table-column label="工序编号">
+        <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="工序名称">
+        <el-table-column label="工序名称">
           <template slot-scope="scope">{{ scope.row.name }}</template>
         </el-table-column>
-         <el-table-column label="工序类别">
+        <el-table-column label="工序类别">
           <template slot-scope="scope">{{ type_[scope.row.type] }}</template>
         </el-table-column>
-         <el-table-column label="生产车间" >
-          <template slot-scope="scope"  v-if="scope.row.workshop_">{{ scope.row.workshop_.name }}</template>
+        <el-table-column label="生产车间">
+          <template slot-scope="scope" v-if="scope.row.workshop_">{{ scope.row.workshop_.name }}</template>
         </el-table-column>
-      <el-table-column align="center" label="指导书">
+        <el-table-column align="center" label="指导书" show-overflow-tooltip min-width="110">
           <template slot-scope="scope" v-if="scope.row.instruction_">
-            <el-link :href="scope.row.instruction_.path" >{{scope.row.instruction_.name}}</el-link>
+            <el-link :href="scope.row.instruction_.path">{{scope.row.instruction_.name}}</el-link>
           </template>
         </el-table-column>
-          <el-table-column label="创建时间">
+        <el-table-column label="创建时间">
           <template slot-scope="scope">{{ scope.row.create_time }}</template>
         </el-table-column>
         <el-table-column
@@ -46,25 +45,26 @@
           width="220px"
         >
           <template slot-scope="scope">
-           
-            
-             <el-link
+            <el-link
               type="primary"
               @click="handleAdd(scope)"
-              >添加子工序</el-link
             >
+              添加子工序
+            </el-link>
             <el-link
               v-if="checkPermission(['process_update'])"
               type="primary"
               @click="handleEdit(scope)"
-              >编辑</el-link
             >
+              编辑
+            </el-link>
             <el-link
               v-if="checkPermission(['process_delete'])"
               type="danger"
               @click="handleDelete(scope)"
-              >删除</el-link
             >
+              删除
+            </el-link>
           </template>
         </el-table-column>
       </el-table>
@@ -77,7 +77,7 @@
       />
     </el-card>
     <el-dialog
-    :close-on-click-modal="false"
+      :close-on-click-modal="false"
       :visible.sync="dialogVisible"
       :title="dialogType === 'edit' ? '编辑工序' : '新增工序'"
     >
@@ -89,43 +89,42 @@
         :rules="rule1"
       >
         <el-form-item label="工序名称" prop="name">
-          <el-input v-model="process.name" placeholder="工序名称" />
+          <el-input v-model="process.name" placeholder="工序名称"/>
         </el-form-item>
         <el-form-item label="工序编号" prop="number">
-          <el-input v-model="process.number" placeholder="工序编号" />
+          <el-input v-model="process.number" placeholder="工序编号"/>
         </el-form-item>
-         <el-form-item label="工序编号" prop="type">
-           <el-select  style="width: 100%" v-model="process.type" placeholder="请选择" >
-             <el-option
-                v-for="item in option"
-                :key="item.value"
-                :label="item.label"
-               :value="item.value">
-              </el-option>
+        <el-form-item label="工序编号" prop="type">
+          <el-select style="width: 100%" v-model="process.type" placeholder="请选择">
+            <el-option
+              v-for="item in option"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="生产车间" prop="workshop">
-            <treeselect v-model="process.workshop"  :options="workoptions" placeholder="所属部门"/>
+          <treeselect v-model="process.workshop" :options="workoptions" placeholder="所属部门"/>
         </el-form-item>
-       <el-form-item label="指导书内容" prop="instruction_content">
-          <el-input  type="textarea"  :rows="3" v-model="process.instruction_content" placeholder="指导书内容" />
+        <el-form-item label="指导书内容" prop="instruction_content">
+          <el-input type="textarea" :rows="3" v-model="process.instruction_content" placeholder="指导书内容"/>
         </el-form-item>
-         <el-form-item label="指导书" prop="template" v-if="dialogVisible">
+        <el-form-item label="指导书" prop="template" v-if="dialogVisible">
           <el-upload
-          ref="upload"
-          :action="upUrl"
-          :on-preview="handlePreview"
-          :on-success="handleUpSuccess"
-          :on-remove="handleRemove"
-          :headers="upHeaders"
-          :file-list="fileList"
-          :limit="1"
-          accept=".doc,.docx,.xls,.xlsx,.ppt,.pptx"
-        >
-          <el-button size="small" type="primary">上传文件</el-button>
-        </el-upload>
+            ref="upload"
+            :action="upUrl"
+            :on-preview="handlePreview"
+            :on-success="handleUpSuccess"
+            :on-remove="handleRemove"
+            :headers="upHeaders"
+            :file-list="fileList"
+            :limit="1"
+            accept=".doc,.docx,.xls,.xlsx,.ppt,.pptx"
+          >
+            <el-button size="small" type="primary">上传文件</el-button>
+          </el-upload>
         </el-form-item>
-        
       </el-form>
       <div style="text-align: right">
         <el-button type="danger" @click="dialogVisible = false">取消</el-button>
@@ -135,42 +134,42 @@
   </div>
 </template>
 <script>
-import { getProcessList, createProcess,updateProcess,deleteProcess } from "@/api/mtm";
-import checkPermission from "@/utils/permission";
-import { getOrgAll } from "@/api/org"
-import { upUrl, upHeaders } from "@/api/file";
-import Treeselect from '@riophae/vue-treeselect'
+  import {getProcessList, createProcess, updateProcess, deleteProcess} from "@/api/mtm";
+  import checkPermission from "@/utils/permission";
+  import {getOrgAll} from "@/api/org"
+  import {upUrl, upHeaders} from "@/api/file";
+  import Treeselect from '@riophae/vue-treeselect'
 
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import { genTree } from "@/utils";
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-const defaultprocess = {
-  name: "",
-  number: "",
-};
-export default {
-  components: { Pagination,Treeselect },
-  data() {
-    return {
-      process: defaultprocess,
-     processList: {
-        count: 0,
-      },
-       upHeaders: upHeaders(),
-      upUrl: upUrl(),
-      fileList:[],
-      workoptions:[],
-      listQuery: {
-        page: 1,
-        page_size: 20,
-      },
-     type_:{
-        10:'特殊',
-        20:'关键',
-        30:'普通',
-        
-     },
-      option: [{
+  import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+  import {genTree} from "@/utils";
+  import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+  const defaultprocess = {
+    name: "",
+    number: "",
+  };
+  export default {
+    components: {Pagination, Treeselect},
+    data() {
+      return {
+        process: defaultprocess,
+        processList: {
+          count: 0,
+        },
+        upHeaders: upHeaders(),
+        upUrl: upUrl(),
+        fileList: [],
+        workoptions: [],
+        listQuery: {
+          page: 1,
+          page_size: 20,
+        },
+        type_: {
+          10: '特殊',
+          20: '关键',
+          30: '普通',
+
+        },
+        option: [{
           value: 10,
           label: '特殊'
         }, {
@@ -180,144 +179,140 @@ export default {
           value: 30,
           label: '普通'
         }],
-      listLoading: true,
-      dialogVisible: false,
-      dialogType: "new",
-      rule1: {
-        name: [{ required: true, message: "请输入", trigger: "blur" }],
-        number: [{ required: true, message: "请输入", trigger: "blur" }],
-       
-      },
-    };
-  },
-  computed: {},
-  watch: {},
-  created() {
-    this.getList();
-    this.getOrgAll();
-   
-  },
-  methods: {
-    checkPermission,
-    //工序列表
-    getList() {
-      this.listLoading = true;
-      getProcessList(this.listQuery).then((response) => {
-        if (response.data) {
-          this.processList = response.data;
-        }
-        this.listLoading = false;
-      });
-    },
-    //生产车间
-     getOrgAll() {
-      this.treeLoding = true;
-      getOrgAll().then(response => {
-        this.workoptions = genTree(response.data);
-        this.treeLoding = false;
-      });
-    },
-     handlePreview(file) {
-      if ("url" in file) {
-        window.open(file.url);
-      } else {
-        window.open(file.response.data.path);
-      }
-    },
-    handleUpSuccess(res, file, filelist) {
-      this.process.instruction = res.data.id;
-    },
-    handleRemove(file, filelist){
-      this.process.instruction = null;
-    },
-   //添加子工序
-   handleAdd(scope)
-   {
-     this.$router.push({name: "Step", params: { id: scope.row.id }, })
-   },
-    
+        listLoading: true,
+        dialogVisible: false,
+        dialogType: "new",
+        rule1: {
+          name: [{required: true, message: "请输入", trigger: "blur"}],
+          number: [{required: true, message: "请输入", trigger: "blur"}],
 
-    
-    handleFilter() {
-      this.listQuery.page = 1;
+        },
+      };
+    },
+    computed: {},
+    watch: {},
+    created() {
       this.getList();
+      this.getOrgAll();
     },
-    resetFilter() {
-      this.listQuery = {
-        page: 1,
-        page_size: 20,
-      }
-      this.getList();
-    },
-    handleCreate() {
-      this.process = Object.assign({}, defaultprocess);
-      this.dialogType = "new";
-      this.dialogVisible = true;
-       this.fileList=[];
-      this.$nextTick(() => {
-        this.$refs["Form"].clearValidate();
-      });
-    },
-   
-    handleEdit(scope) {
-      this.process = Object.assign({}, scope.row); // copy obj
-      this.dialogType = "edit";
-      this.dialogVisible = true;
-       if (this.process.instruction) {
-        this.fileList = [
-          {
-            name:this.process.instruction_.name,
-            url: this.process.instruction_.path,
-          },
-        ];
-      }
-      this.$nextTick(() => {
-        this.$refs["Form"].clearValidate();
-      });
-    },
-    handleDelete(scope) {
-      this.$confirm("确认删除?", "警告", {
-        confirmButtonText: "确认",
-        cancelButtonText: "取消",
-        type: "error",
-      })
-        .then(async () => {
-          await deleteProcess(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) {
-            updateProcess(this.process.id, this.process).then((res) => {
-              if (res.code >= 200) {
-                this.getList();
-                this.dialogVisible = false;
-                this.$message.success("成功");
-              }
-            });
-          } else {
-            createProcess(this.process).then((res) => {
-              if (res.code >= 200) {
-                this.getList();
-                 this.dialogVisible = false;
-                this.$message.success("成功");
-              }
-            });
+    methods: {
+      checkPermission,
+      //工序列表
+      getList() {
+        this.listLoading = true;
+        getProcessList(this.listQuery).then((response) => {
+          if (response.data) {
+            this.processList = response.data;
           }
+          this.listLoading = false;
+        });
+      },
+      //生产车间
+      getOrgAll() {
+        this.treeLoding = true;
+        getOrgAll().then(response => {
+          this.workoptions = genTree(response.data);
+          this.treeLoding = false;
+        });
+      },
+      handlePreview(file) {
+        if ("url" in file) {
+          window.open(file.url);
         } else {
-          return false;
+          window.open(file.response.data.path);
         }
-      });
+      },
+      handleUpSuccess(res, file, filelist) {
+        this.process.instruction = res.data.id;
+      },
+      handleRemove(file, filelist) {
+        this.process.instruction = null;
+      },
+      //添加子工序
+      handleAdd(scope) {
+        this.$router.push({name: "Step", params: {id: scope.row.id},})
+      },
+
+      handleFilter() {
+        this.listQuery.page = 1;
+        this.getList();
+      },
+      resetFilter() {
+        this.listQuery = {
+          page: 1,
+          page_size: 20,
+        }
+        this.getList();
+      },
+      handleCreate() {
+        this.process = Object.assign({}, defaultprocess);
+        this.dialogType = "new";
+        this.dialogVisible = true;
+        this.fileList = [];
+        this.$nextTick(() => {
+          this.$refs["Form"].clearValidate();
+        });
+      },
+
+      handleEdit(scope) {
+        this.process = Object.assign({}, scope.row); // copy obj
+        this.dialogType = "edit";
+        this.dialogVisible = true;
+        if (this.process.instruction) {
+          this.fileList = [
+            {
+              name: this.process.instruction_.name,
+              url: this.process.instruction_.path,
+            },
+          ];
+        }
+        this.$nextTick(() => {
+          this.$refs["Form"].clearValidate();
+        });
+      },
+      handleDelete(scope) {
+        this.$confirm("确认删除?", "警告", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+          type: "error",
+        })
+          .then(async () => {
+            await deleteProcess(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) {
+              updateProcess(this.process.id, this.process).then((res) => {
+                if (res.code >= 200) {
+                  this.getList();
+                  this.dialogVisible = false;
+                  this.$message.success("成功");
+                }
+              });
+            } else {
+              createProcess(this.process).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/pm/plan.vue b/hb_client/src/views/pm/plan.vue
index 3b75c6c..7900b38 100644
--- a/hb_client/src/views/pm/plan.vue
+++ b/hb_client/src/views/pm/plan.vue
@@ -114,60 +114,50 @@
           stripe
           style="width: 100%"
           height="250"
-
-
         >
           <el-table-column type="index" width="50"/>
-
           <el-table-column label="订单编号" width="110">
             <template slot-scope="scope">{{ scope.row.number }}</template>
           </el-table-column>
-          <el-table-column label="客户名称" width="110">
+          <el-table-column label="客户名称" show-overflow-tooltip min-width="110">
             <template slot-scope="scope" show-overflow-tooltip>{{ scope.row.customer_.name }}</template>
           </el-table-column>
-
-          <el-table-column label="合同编号" width="110">
+          <el-table-column label="合同编号" show-overflow-tooltip min-width="110">
             <template slot-scope="scope" v-if="scope.row.contract">{{ scope.row.contract_.number }}</template>
           </el-table-column>
-          <el-table-column label="合同名称" show-overflow-tooltip width="110">
+          <el-table-column label="合同名称" show-overflow-tooltip min-width="110">
             <template slot-scope="scope" v-if="scope.row.contract">{{ scope.row.contract_.name }}</template>
           </el-table-column>
-          <el-table-column label="所需产品" show-overflow-tooltip width="150">
+          <el-table-column label="所需产品" show-overflow-tooltip min-width="150">
             <template slot-scope="scope">{{ scope.row.product_.name }}</template>
           </el-table-column>
           <el-table-column label="产品型号" width="110">
             <template slot-scope="scope">{{ scope.row.product_.specification }}</template>
           </el-table-column>
-          <el-table-column label="产品数量" width="110">
+          <el-table-column label="产品数量">
             <template slot-scope="scope">{{ scope.row.count }}</template>
           </el-table-column>
-          <el-table-column label="已派数量" width="110">
+          <el-table-column label="已派数量">
             <template slot-scope="scope">{{ scope.row.planed_count }}</template>
           </el-table-column>
-
-          <el-table-column label="交货日期" width="110">
+          <el-table-column label="交货日期" width="100">
             <template slot-scope="scope">{{ scope.row.delivery_date }}</template>
           </el-table-column>
-
-
-          <el-table-column label="创建时间">
+          <el-table-column label="创建时间" show-overflow-tooltip min-width="110">
             <template slot-scope="scope">{{ scope.row.create_time }}</template>
           </el-table-column>
           <el-table-column
             align="center"
             label="操作"
-             fixed="right"
-            width="100px"
+            fixed="right"
+            width="80px"
           >
             <template slot-scope="scope">
-
               <el-link type="primary"
                        v-if="checkPermission(['warehouse_update'])"
                        @click="handleclick(scope)"
               >排产
-              </el-link
-              >
-
+              </el-link>
             </template>
           </el-table-column>
         </el-table>
diff --git a/hb_client/src/views/statistics/materialStatistics.vue b/hb_client/src/views/statistics/materialStatistics.vue
index d32d704..80a9fc9 100644
--- a/hb_client/src/views/statistics/materialStatistics.vue
+++ b/hb_client/src/views/statistics/materialStatistics.vue
@@ -9,14 +9,14 @@
               <Echart
                 :options="pieOptions"
                 id="pieChart"
-                height="400px"
+                height="45vh"
               ></Echart>
             </el-card>
           </el-col>
           <el-col :span="16">
             <el-card>
               <div class="chartsTitle">废料原因统计</div>
-              <div id="barChart" style="width:100%;height: 400px;"></div>
+              <div id="barChart" style="width:100%;height: 45vh"></div>
             </el-card>
           </el-col>
         </el-row>
@@ -56,7 +56,7 @@
                 :id="chartId1"
                 :options="barOptions"
                 :className="chartsName"
-                height="400px"
+                height="45vh"
                 width="600px"
               >
               </charts>
@@ -69,7 +69,7 @@
                 :id="chartId2"
                 :options="barOptions"
                 :className="chartsName"
-                height="400px"
+                height="45vh"
                 width="600px"
               >
               </charts>
@@ -111,7 +111,7 @@
               :id="chartId3"
               :options="barOptions"
               :className="chartsName"
-              height="400px"
+              height="45vh"
             >
             </charts>
           </el-card>
diff --git a/hb_client/src/views/statistics/progressStatistics.vue b/hb_client/src/views/statistics/progressStatistics.vue
index 4b1942d..0e5ee33 100644
--- a/hb_client/src/views/statistics/progressStatistics.vue
+++ b/hb_client/src/views/statistics/progressStatistics.vue
@@ -7,7 +7,7 @@
           <Echart
             :options="pieOptions"
             id="pieChart"
-            height="400px"
+            height="45vh"
           ></Echart>
         </el-card>
       </el-col>
@@ -18,7 +18,7 @@
             :id="chartId1"
             :options="barOptions"
             :className="chartsName"
-            height="400px"
+            height="45vh"
             width="100%"
           >
           </charts>
@@ -31,7 +31,7 @@
             :id="chartId2"
             :options="barOptions1"
             :className="chartsName"
-            height="400px"
+            height="45vh"
             width="100%"
           >
           </charts>
@@ -55,10 +55,10 @@
           >
             <el-table-column type="index" width="50" />
 
-            <el-table-column label="订单编号"  width="160" show-overflow-tooltip>
+            <el-table-column label="订单编号"  width="120" show-overflow-tooltip>
               <template slot-scope="scope">{{ scope.row.number }}</template>
             </el-table-column>
-            <el-table-column label="产品名称"  width="200" show-overflow-tooltip>
+            <el-table-column label="产品名称"  width="160" show-overflow-tooltip>
               <template slot-scope="scope">{{ scope.row.product_.name }}</template>
             </el-table-column>
             <el-table-column label="产品数量">
diff --git a/hb_client/src/views/wpm/worktask.vue b/hb_client/src/views/wpm/worktask.vue
index 1cdc21a..acaf939 100644
--- a/hb_client/src/views/wpm/worktask.vue
+++ b/hb_client/src/views/wpm/worktask.vue
@@ -17,92 +17,96 @@
           highlight-current-row
           @current-change="handleCurrentChange"
         >
-          <el-table-column type="index" width="50" />
-
-          <el-table-column label="子计划编号" width="100">
+          <el-table-column type="index" width="50"/>
+          <el-table-column label="子计划编号" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">{{ scope.row.number }}</template>
           </el-table-column>
-          <el-table-column label="产品名称">
-            <template slot-scope="scope">{{
-              scope.row.plan_product_.name
-            }}</template>
+          <el-table-column label="产品名称" min-width="120" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.plan_product_.name}}
+            </template>
           </el-table-column>
           <el-table-column label="产品型号">
-            <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="生产主产品" width="140">
-            <template slot-scope="scope">{{
-              scope.row.product_.name
-            }}</template>
+          <el-table-column label="生产主产品" min-width="130" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.product_.name}}
+            </template>
           </el-table-column>
-          <el-table-column label="名称">
-            <template slot-scope="scope">{{
-              scope.row.subproduction_.name
-            }}</template>
+          <el-table-column label="名称" min-width="100" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.subproduction_.name}}
+            </template>
           </el-table-column>
-
-          <el-table-column label="生产车间">
-            <template slot-scope="scope">{{
-              scope.row.workshop_.name
-            }}</template>
+          <el-table-column label="生产车间" min-width="100" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.workshop_.name}}
+            </template>
           </el-table-column>
-
-          <el-table-column label="子工序" width="160">
+          <el-table-column label="子工序" min-width="160">
             <template slot-scope="scope" v-if="scope.row.steps">
               <el-tag
                 v-for="item in scope.row.steps"
                 :key="item.number"
                 :label="item.name"
                 :value="item.number"
-                >{{ item.name }}</el-tag
               >
+                {{ item.name }}
+              </el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="开工时间">
+          <el-table-column label="开工时间" width="100">
             <template slot-scope="scope">{{ scope.row.start_date }}</template>
           </el-table-column>
-          <el-table-column label="完工时间">
+          <el-table-column label="完工时间" width="100">
             <template slot-scope="scope">{{ scope.row.end_date }}</template>
           </el-table-column>
           <el-table-column label="状态">
             <template slot-scope="scope">
-              {{ state_[scope.row.state] }}</template
-            >
+              {{ state_[scope.row.state] }}
+            </template>
           </el-table-column>
-          <el-table-column label="领料状态" width="100">
+          <el-table-column label="领料状态" width="80">
             <template slot-scope="scope">
               <el-tag v-if="scope.row.is_picked == false">未领料</el-tag>
               <el-tag v-else>已领料</el-tag>
             </template>
           </el-table-column>
-
           <el-table-column label="计划/生产/合格">
-            <template slot-scope="scope"
-              >{{ scope.row.count }}/{{ scope.row.count_real }}/{{
-                scope.row.count_ok
-              }}</template
-            >
+            <template slot-scope="scope">
+              {{ scope.row.count }}/{{ scope.row.count_real }}/{{scope.row.count_ok}}
+            </template>
           </el-table-column>
-
-          <el-table-column align="center" label="操作" width="130px">
+          <el-table-column
+            align="center"
+            label="操作"
+            width="80px"
+            fixed="right"
+          >
             <template slot-scope="scope">
               <el-link
                 type="success"
                 v-if="scope.row.is_picked == false"
                 @click="handleNeed(scope)"
-                >领料</el-link
               >
+                领料
+              </el-link>
               <el-link
                 type="success"
                 v-if="scope.row.is_picked"
                 @click="handleNeed(scope)"
-                >继续领料</el-link
               >
-              <el-link type="primary" @click="handlepick(scope)"
-                >领半成品</el-link
+                继续领料
+              </el-link>
+              <el-link
+                type="primary"
+                @click="handlepick(scope)"
               >
+                领半成品
+              </el-link>
             </template>
           </el-table-column>
         </el-table>
@@ -127,79 +131,74 @@
                 :label="item.name"
                 :value="item.number"
                 @click="handlework(item)"
-                >{{ item.name }}</el-button
               >
-               <el-button
+                {{ item.name }}
+              </el-button>
+              <el-button
                 type="primary"
                 @click="handleScrapbcp()"
                 id="scrap"
                 style="float: right; display: none"
-                >报废</el-button
               >
-              <el-badge :value="count" class="item"  style="float:right">
-  <el-button
-                type="primary"
-                @click="handleAll()"
-               
-                >显示全部</el-button
-              >
-</el-badge>
-             
-             
-
+                报废
+              </el-button>
+              <el-badge :value="count" class="item" style="float:right">
+                <el-button
+                  type="primary"
+                  @click="handleAll()"
+                >
+                  显示全部
+                </el-button>
+              </el-badge>
               <el-table
-                :data="wproductData"
-                @selection-change="handleSelectionChange"
                 border
                 fit
                 stripe
                 style="width: 100%"
                 max-height="300"
+                :data="wproductData"
+                @selection-change="handleSelectionChange"
               >
-                <el-table-column type="selection" width="55"> </el-table-column>
-                <el-table-column type="index" width="50" />
-                <el-table-column label="子计划编号"  width="100">
-                  <template slot-scope="scope">{{
-                    scope.row.subproduction_plan_.number
-                  }}</template>
+                <el-table-column type="selection" width="40"></el-table-column>
+                <el-table-column type="index" width="50"/>
+                <el-table-column label="子计划编号" width="100" show-overflow-tooltip>
+                  <template slot-scope="scope">{{ scope.row.number }}</template>>
+                  <template slot-scope="scope">
+                    {{scope.row.subproduction_plan_.number}}
+                  </template>
                 </el-table-column>
-
-                <el-table-column label="玻璃编号">
-                  <template slot-scope="scope">{{ scope.row.number }}</template>
+                <el-table-column label="玻璃编号" width="100" show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    {{ scope.row.number }}
+                  </template>
                 </el-table-column>
-
-                <el-table-column label="玻璃状态">
-                  <template slot-scope="scope">{{
-                    scope.row.material_.name
-                  }}</template>
+                <el-table-column label="玻璃状态" 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.step_.name
-                  }}</template>
+                <el-table-column label="所在子工序" width="100" show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    {{scope.row.step_.name}}
+                  </template>
                 </el-table-column>
-                <el-table-column label="进行状态">
-                  <template slot-scope="scope">{{
-                    actstate_[scope.row.act_state]
-                  }}</template>
+                <el-table-column label="进行状态" width="100" show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    {{actstate_[scope.row.act_state]}}
+                  </template>
                 </el-table-column>
- <el-table-column label="不合格标记">
-              <template slot-scope="scope">
-                {{ ng_sign_[scope.row.ng_sign] }}
-              </template>
-            </el-table-column>
-                <el-table-column label="更新时间">
-                  <template slot-scope="scope">{{
-                    scope.row.update_time
-                  }}</template>
+                <el-table-column label="不合格标记" width="100">
+                  <template slot-scope="scope">
+                    {{ ng_sign_[scope.row.ng_sign] }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="更新时间" width="160">
+                  <template slot-scope="scope">
+                    {{scope.row.update_time}}
+                  </template>
                 </el-table-column>
               </el-table>
-
-
-              
             </el-card>
-            
           </el-col>
           <el-col :span="12">
             <el-card class="box-card">
@@ -214,21 +213,21 @@
                 style="width: 100%"
                 max-height="300"
               >
-                <el-table-column type="index" width="50" />
-                <el-table-column label="子计划编号"  width="100">
-                  <template slot-scope="scope">{{
-                    scope.row.subproduction_plan_.number
-                  }}</template>
+                <el-table-column type="index" width="50"/>
+                <el-table-column label="子计划编号" min-width="100" show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    {{scope.row.subproduction_plan_.number }}
+                  </template>
                 </el-table-column>
-                <el-table-column label="物料名称">
-                  <template slot-scope="scope">{{
-                    scope.row.material_.name
-                  }}</template>
+                <el-table-column label="物料名称" min-width="130" 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.material_.unit
-                  }}</template>
+                  <template slot-scope="scope">
+                    {{scope.row.material_.unit}}
+                  </template>
                 </el-table-column>
                 <el-table-column label="物料批次">
                   <template slot-scope="scope">{{ scope.row.batch }}</template>
@@ -242,13 +241,13 @@
         </el-row>
       </el-tab-pane>
     </el-tabs>
-     <el-dialog
+    <el-dialog
       title="半成品报废"
       :close-on-click-modal="false"
       :visible.sync="dialogFormVisiblebcp"
     >
       <el-form :model="formbcp">
-        <el-form-item label="甩片原因" >
+        <el-form-item label="甩片原因">
           <el-select
             style="width: 80%"
             v-model="formbcp.scrap_reason"
@@ -283,7 +282,7 @@
         </el-table-column>
         <el-table-column prop="material_.unit" label="物料单位">
         </el-table-column>
-        <el-table-column prop="count" label="所需物料数量"> </el-table-column>
+        <el-table-column prop="count" label="所需物料数量"></el-table-column>
         <el-table-column prop="count_pick" label="已领物料数量">
         </el-table-column>
         <el-table-column prop="count_real" label="实际产出/消耗">
@@ -293,8 +292,9 @@
             <el-link
               v-if="checkPermission(['material_update'])"
               @click="handleReceive(scope)"
-              >领半成品</el-link
             >
+              领半成品
+            </el-link>
           </template>
         </el-table-column>
       </el-table>
@@ -303,7 +303,6 @@
         <el-button type="primary" @click="bcpllSubmit">确 定</el-button>
       </div>
     </el-dialog>
-
     <el-dialog
       title="半成品列表"
       :close-on-click-modal="false"
@@ -318,20 +317,17 @@
         max-height="300"
         @selection-change="handleSelectionChangess"
       >
-        <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>
-
         <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.subproduction_plan_.number }}</template>
-            </el-table-column>
+          <template slot-scope="scope">{{ scope.row.subproduction_plan_.number }}</template>
+        </el-table-column>
         <el-table-column label="备注">
           <template slot-scope="scope">{{ scope.row.remark }}</template>
         </el-table-column>
@@ -341,7 +337,6 @@
         <el-button type="primary" @click="wproductSubmit">确 定</el-button>
       </div>
     </el-dialog>
-
     <el-dialog
       :visible.sync="dialogVisiblenw"
       :close-on-click-modal="false"
@@ -381,8 +376,9 @@
             style="float: right; padding: 3px 0"
             @click="handlePick"
             type="text"
-            >确认领料</el-button
           >
+            确认领料
+          </el-button>
         </div>
         <template>
           <el-table
@@ -391,17 +387,17 @@
             height="300"
             style="width: 100%"
           >
-            <el-table-column prop="batch" label="物料批次"> </el-table-column>
+            <el-table-column prop="batch" label="物料批次"></el-table-column>
             <el-table-column prop="material_.name" label="物料名称">
             </el-table-column>
             <el-table-column prop="warehouse_.name" label="物料所在仓库">
             </el-table-column>
-            <el-table-column prop="count" label="物料总数量"> </el-table-column>
+            <el-table-column prop="count" label="物料总数量"></el-table-column>
             <el-table-column label="输入领料数量" width="140px">
               <template slot-scope="scope">
                 <el-form
-                  :model="scope.row"
                   v-if="scope.row.material_.type != 2"
+                  :model="scope.row"
                   widht="100px"
                 >
                   <el-form-item size="mini">
@@ -415,7 +411,6 @@
                 </el-form>
               </template>
             </el-table-column>
-
             <el-table-column prop="count_pick" label="已领物料数量">
             </el-table-column>
             <el-table-column prop="material_.specification" label="物料规格">
@@ -427,8 +422,9 @@
                 <el-link
                   v-if="scope.row.material_.type == 2"
                   @click="handlewproduct(scope)"
-                  >选择半成品</el-link
                 >
+                  选择半成品
+                </el-link>
               </template>
             </el-table-column>
           </el-table>
@@ -449,23 +445,20 @@
         max-height="600"
         @selection-change="handleSelectionChanges"
       >
-        <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>
+          <template slot-scope="scope">{{ scope.row.number}}</template>
         </el-table-column>
-
         <el-table-column label="半成品批次">
-          <template slot-scope="scope">{{ scope.row.batch }}</template>
+          <template slot-scope="scope">{{ scope.row.batch}}</template>
         </el-table-column>
         <el-table-column label="玻璃状态">
-          <template slot-scope="scope">{{ scope.row.material_.name }}</template>
+          <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>
       <div slot="footer" class="dialog-footer">
@@ -499,7 +492,6 @@
           <el-card class="box-card" v-if="showPrise1 && values === 0">
             <div slot="header" class="clearfix">
               <span>消耗物料表</span>
-
               <el-table :data="input" border style="width: 100%">
                 <el-table-column
                   prop="subproduction_plan"
@@ -556,7 +548,6 @@
                   width="180"
                 >
                 </el-table-column>
-
                 <el-table-column
                   prop="count_output"
                   label="产出数量"
@@ -589,34 +580,35 @@
           </el-form-item>
         </el-form>
         <el-button style="margin-top: 12px" @click="next" v-if="values == 0"
-          >下一步</el-button
         >
+          下一步
+        </el-button>
       </el-card>
       <el-card
-        class="box-card"
         v-for="(itemf, $index) in otherforms"
         :key="$index"
+        class="box-card"
       >
         <el-form
+          v-if="values === $index + 1"
           label-width="80px"
           label-position="right"
-          v-if="values === $index + 1"
         >
           <el-row v-for="(item, $index) in itemf.form_fields" :key="$index">
             <el-form-item
               v-if="item.field_type === 'string'"
               :label="item.field_name"
             >
-              <el-input placeholder="请输入" v-model="item.sort" />
+              <el-input placeholder="请输入" v-model="item.sort"/>
             </el-form-item>
             <el-form-item
               v-else-if="item.field_type === 'int'"
               :label="item.field_name"
             >
               <el-input
+                v-model="item.sort"
                 type="number"
                 placeholder="请输入"
-                v-model="item.sort"
               />
             </el-form-item>
             <el-form-item
@@ -624,9 +616,9 @@
               :label="item.field_name"
             >
               <el-input
+                v-model="item.sort"
                 type="number"
                 placeholder="请输入"
-                v-model="item.sort"
               />
             </el-form-item>
             <el-form-item
@@ -660,8 +652,8 @@
               :label="item.field_name"
             >
               <el-select
-                style="width: 100%"
                 v-model="item.sort"
+                style="width: 100%"
                 placeholder="请选择"
               >
                 <el-option
@@ -695,485 +687,485 @@
           </el-row>
         </el-form>
         <el-button
+          v-if="values == $index + 2"
           style="margin-top: 12px"
           @click="next"
-          v-if="values == $index + 2"
-          >下一步</el-button
-        >
+        >下一步
+        </el-button>
         <el-button
           style="margin-top: 12px"
           @click="prev"
           v-if="values == $index + 1"
-          >上一步</el-button
-        >
+        >上一步
+        </el-button>
       </el-card>
-
       <div style="text-align: right; position: sticky">
-        <el-button type="danger" @click="dialogVisiblework = false"
-          >取消</el-button
+        <el-button
+          type="danger"
+          @click="dialogVisiblework = false"
         >
+          取消
+        </el-button>
         <el-button type="primary" @click="submint()">确认</el-button>
       </div>
     </el-dialog>
-   
   </div>
 </template>
 <style>
-.item {
- 
-  margin-right: 20px;
-}
+  .item {
+    margin-right: 20px;
+  }
 </style>
-  <script>
-import { getsubproductionplanList, createPick_need } from "@/api/pm";
-import checkPermission from "@/utils/permission";
-import { getProcessList, getStepLists } from "@/api/mtm";
-import {
-  createPick,
-  getwmaterialList,
-  submitWork,
-  getwproductList,
-  getsubplanList,
-  getpickhalfList,
-  createpickhalf,
-  createOperation,
-  scrap
-} from "@/api/wpm";
-import { getiproductList } from "@/api/inm";
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-const defaulteneed = {};
-export default {
-  components: { Pagination },
+<script>
+  import {getsubproductionplanList, createPick_need} from "@/api/pm";
+  import checkPermission from "@/utils/permission";
+  import {getProcessList, getStepLists} from "@/api/mtm";
+  import {
+    createPick,
+    getwmaterialList,
+    submitWork,
+    getwproductList,
+    getsubplanList,
+    getpickhalfList,
+    createpickhalf,
+    createOperation,
+    scrap
+  } from "@/api/wpm";
+  import {getiproductList} from "@/api/inm";
+  import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+  const defaulteneed = {};
+  export default {
+    components: {Pagination},
 
-  data() {
-    return {
-      need: defaulteneed,
-      subproductionplanList: {
-        count: 0,
-      },
-      wmaterialList: [],
-      listQuery: {
-        page: 1,
-        page_size: 20,
-      },
-      iproductData: [],
-      remark: "",
-      values: 0,
-      active: 0,
-      activeName: "1",
-      havewl: "",
-      needwl: "",
-      showPrise: false,
-      showPrise1: false,
-      actstate_: {
-        6: "待复检",
-        10: "操作进行中",
-        20: "待检验",
-        30: "已合格",
-        40: "库存中",
-        50: "不合格",
-        60: "待成品检验",
-        8: "操作准备中",
-        26: "待夹层检验",
-        70: "报废",
-      },
-      ng_sign_: {
-         10: "返工",
-        20: "返修",
-        30: "报废",
-        40: "让步接受",
-        50: "偏离许可",
-        60: "降级使用",
-        70: "退回供方",
-        80: "召回",
-       
-      },
-      state_: {
-        0: "制定中",
-        1: "已下达",
-        2: "已接受",
-        3: "生产中",
-        4: "已完成",
-      },
-      listLoading: true,
-      listLoading: true,
-      id: "",
-      dialogTableVisible: false,
-      dialogVisible: false,
-      dialogTableVisiblepick: false,
-      dialogTableVisiblepicks: false,
-      dialogType: "new",
-      dialogVisiblework: false,
-      dialogVisiblenw: false,
-      dialogTypenw: "new",
-      picks: [],
-      pickData: {},
-      steps: [],
-      step: null,
-      processOption: [],
-      subproduction_plan: "",
-      form1: [],
-      form2: [],
-      form3: [],
-      input: [],
-      output: [],
-      forms: [],
-      inputData: [],
-      outputData: [],
-      field1: [],
-      field2: [],
-      fromData: [],
-      wproductData: [],
-      wpID: [],
-      multipleSelection: [],
-      wproducts: [],
-      otherforms: [],
-      from: [],
-      Operation: {},
-      wproductdata: {},
-      workData: {},
-      bcplist: [],
-      wproductslist: [],
-      formbcp: {},
-      dialogFormVisiblebcp: false,
-      scrapreason: [
-        { lable: "气泡", value: 10 },
-        { lable: "破点", value: 20 },
-        { lable: "划伤", value: 30 },
-        { lable: "其他", value: 40 },
-      ],
-      count:null,
-    };
-  },
-  process: "",
-  computed: {},
-  watch: {},
-  created() {
-    this.getProcessList();
-  },
-  methods: {
-    checkPermission,
+    data() {
+      return {
+        need: defaulteneed,
+        subproductionplanList: {
+          count: 0,
+        },
+        wmaterialList: [],
+        listQuery: {
+          page: 1,
+          page_size: 20,
+        },
+        iproductData: [],
+        remark: "",
+        values: 0,
+        active: 0,
+        activeName: "1",
+        havewl: "",
+        needwl: "",
+        showPrise: false,
+        showPrise1: false,
+        actstate_: {
+          6: "待复检",
+          10: "操作进行中",
+          20: "待检验",
+          30: "已合格",
+          40: "库存中",
+          50: "不合格",
+          60: "待成品检验",
+          8: "操作准备中",
+          26: "待夹层检验",
+          70: "报废",
+        },
+        ng_sign_: {
+          10: "返工",
+          20: "返修",
+          30: "报废",
+          40: "让步接受",
+          50: "偏离许可",
+          60: "降级使用",
+          70: "退回供方",
+          80: "召回",
 
-    //选项卡切换
-    handleClick(tab) {
-      this.process = tab.name;
-      this.listQuery.process = tab.name;
-      if (tab.name == 1) {
-        document.getElementById("scrap").style.display = "block";
-      }
-      this.steps = [];
-      getsubplanList(this.listQuery).then((response) => {
-        if (response.data) {
-          this.subproductionplanList = response.data;
-        }
-      });
-
-      //子工序列表
-
-      getStepLists(tab.name).then((response) => {
-        if (response.data) {
-          this.steps = response.data;
-        }
-      });
-      //车间物料表
-      this.getwmaterialLists();
-      // 半成品表
-      this.getwproductLists();
+        },
+        state_: {
+          0: "制定中",
+          1: "已下达",
+          2: "已接受",
+          3: "生产中",
+          4: "已完成",
+        },
+        listLoading: true,
+        listLoading: true,
+        id: "",
+        dialogTableVisible: false,
+        dialogVisible: false,
+        dialogTableVisiblepick: false,
+        dialogTableVisiblepicks: false,
+        dialogType: "new",
+        dialogVisiblework: false,
+        dialogVisiblenw: false,
+        dialogTypenw: "new",
+        picks: [],
+        pickData: {},
+        steps: [],
+        step: null,
+        processOption: [],
+        subproduction_plan: "",
+        form1: [],
+        form2: [],
+        form3: [],
+        input: [],
+        output: [],
+        forms: [],
+        inputData: [],
+        outputData: [],
+        field1: [],
+        field2: [],
+        fromData: [],
+        wproductData: [],
+        wpID: [],
+        multipleSelection: [],
+        wproducts: [],
+        otherforms: [],
+        from: [],
+        Operation: {},
+        wproductdata: {},
+        workData: {},
+        bcplist: [],
+        wproductslist: [],
+        formbcp: {},
+        dialogFormVisiblebcp: false,
+        scrapreason: [
+          {lable: "气泡", value: 10},
+          {lable: "破点", value: 20},
+          {lable: "划伤", value: 30},
+          {lable: "其他", value: 40},
+        ],
+        count: null,
+      };
     },
+    process: "",
+    computed: {},
+    watch: {},
+    created() {
+      this.getProcessList();
+    },
+    methods: {
+      checkPermission,
 
-    //车间物料
-    getwmaterialLists() {
-      getwmaterialList({
-        subproduction_plan__process: this.process,
-        page: 0,
-      }).then((response) => {
-        if (response.data) {
-          this.wmaterialList = response.data;
+      //选项卡切换
+      handleClick(tab) {
+        this.process = tab.name;
+        this.listQuery.process = tab.name;
+        if (tab.name == 1) {
+          document.getElementById("scrap").style.display = "block";
         }
-      });
-    },
+        this.steps = [];
+        getsubplanList(this.listQuery).then((response) => {
+          if (response.data) {
+            this.subproductionplanList = response.data;
+          }
+        });
 
-    //待检半成品报废
-    handleScrapbcp() {
-      this.dialogFormVisiblebcp = true;
-    },
- 
+        //子工序列表
 
-    //确定报废半成品
-    scrapesubmit() {
-      console.log(this.formbcp);
-      scrap(this.wpID, this.formbcp).then((response) => {
-        if (response.code==200) {
-        this.$message.success("该半成品已报废！");
-          this.dialogFormVisiblebcp = false;
+        getStepLists(tab.name).then((response) => {
+          if (response.data) {
+            this.steps = response.data;
+          }
+        });
+        //车间物料表
+        this.getwmaterialLists();
+        // 半成品表
+        this.getwproductLists();
+      },
+
+      //车间物料
+      getwmaterialLists() {
+        getwmaterialList({
+          subproduction_plan__process: this.process,
+          page: 0,
+        }).then((response) => {
+          if (response.data) {
+            this.wmaterialList = response.data;
+          }
+        });
+      },
+
+      //待检半成品报废
+      handleScrapbcp() {
+        this.dialogFormVisiblebcp = true;
+      },
+
+
+      //确定报废半成品
+      scrapesubmit() {
+        console.log(this.formbcp);
+        scrap(this.wpID, this.formbcp).then((response) => {
+          if (response.code == 200) {
+            this.$message.success("该半成品已报废！");
+            this.dialogFormVisiblebcp = false;
             // 半成品表
-      this.getwproductLists();
-        }
-      });
-    },
+            this.getwproductLists();
+          }
+        });
+      },
 
-    //工序对应的子计划，弹出对应的车间物料
-    handleCurrentChange(row) {
-      // this.steps = row.steps; //调出子工序
+      //工序对应的子计划，弹出对应的车间物料
+      handleCurrentChange(row) {
+        // this.steps = row.steps; //调出子工序
 
-      this.subproduction_plan = row.id; //子计划Id
-      this.getwproductLists();
-      getwmaterialList({
-        subproduction_plan__process: this.process,
-        subproduction_plan: row.id,
-        page: 0,
-      }).then((response) => {
-        if (response.data) {
-          this.wmaterialList = response.data;
-        }
-      });
-    },
-    //大工序工序渲染
-    getProcessList() {
-      getProcessList({ page: 0 }).then((response) => {
-        if (response.data) {
-          this.processOption = response.data;
-        }
-      });
-    },
+        this.subproduction_plan = row.id; //子计划Id
+        this.getwproductLists();
+        getwmaterialList({
+          subproduction_plan__process: this.process,
+          subproduction_plan: row.id,
+          page: 0,
+        }).then((response) => {
+          if (response.data) {
+            this.wmaterialList = response.data;
+          }
+        });
+      },
+      //大工序工序渲染
+      getProcessList() {
+        getProcessList({page: 0}).then((response) => {
+          if (response.data) {
+            this.processOption = response.data;
+          }
+        });
+      },
 
-    //显示全部子计划
-    handleAll() {
-      this.listQuery.process = this.process;
-      this.subproduction_plan = "";
-      //子计划
-      getsubproductionplanList(this.listQuery).then((response) => {
-        if (response.data) {
-          this.subproductionplanList = response.data;
-        }
-      });
-      //车间物料表
-      this.getwmaterialLists();
-      // 半成品表
-      this.getwproductLists();
-    },
+      //显示全部子计划
+      handleAll() {
+        this.listQuery.process = this.process;
+        this.subproduction_plan = "";
+        //子计划
+        getsubproductionplanList(this.listQuery).then((response) => {
+          if (response.data) {
+            this.subproductionplanList = response.data;
+          }
+        });
+        //车间物料表
+        this.getwmaterialLists();
+        // 半成品表
+        this.getwproductLists();
+      },
 
-    //大工序下子工序产出的半成品
-    getwproductLists() {
-      this.wproductdata.page = 0;
-     this.wproductdata.tag = "no_scrap";
-      this.wproductdata.step__process = this.process;
-      if (this.subproduction_plan != "") {
-        this.wproductdata.subproduction_plan = this.subproduction_plan;
-      }
-      getwproductList(this.wproductdata).then((response) => {
-        if (response.data) {
-          this.wproductData = response.data;
-          //console.log( this.wproductData)
+      //大工序下子工序产出的半成品
+      getwproductLists() {
+        this.wproductdata.page = 0;
+        this.wproductdata.tag = "no_scrap";
+        this.wproductdata.step__process = this.process;
+        if (this.subproduction_plan != "") {
+          this.wproductdata.subproduction_plan = this.subproduction_plan;
         }
-      });
-    },
-    //调出该批次，该仓库的所有半成品
-    handlewproduct(scope) {
-      this.dialogTableVisible = true;
-      this.pcId = scope.row.id;
-      getiproductList({
-        page: 0,
-        material: scope.row.material,
-        warehouse: scope.row.warehouse,
-        batch: scope.row.batch,
-      }).then((response) => {
-        if (response.data) {
-          this.iproductData = response.data;
-        }
-      });
-    },
-    //勾选半成品
-    handleSelectionChanges(val) {
-      this.iproducts = [];
-      val.forEach((item) => {
-        this.iproducts.push(item.id);
-      });
-    },
-    //提交半成品
-    iproductsSubmit() {
-      this.dialogTableVisible = false;
-      this.havewl.forEach((item) => {
-        if (item.id == this.pcId) {
-          item.iproducts = this.iproducts;
-        }
-      });
-    },
-
-    //领料
-    handleNeed(scope) {
-      this.need = Object.assign({}, defaulteneed);
-      this.dialogVisiblenw = true;
-      this.id = scope.row.id;
-      createPick_need(this.id, this.need).then((res) => {
-        if (res.code >= 200) {
-          this.havewl = res.data.have;
-          this.needwl = res.data.need;
-        }
-      });
-    },
-
-    //确认领料
-    handlePick() {
-      this.pickData.subproduction_plan = this.id;
-
-      this.pickData.picks = this.havewl;
-
-      createPick(this.pickData).then((res) => {
-        if (res.code >= 200) {
-          this.dialogVisiblenw = false;
-
-          this.$message.success("领料成功！");
-          //车间物料表
-          this.getwmaterialLists();
-          // 半成品表
-          this.getwproductLists();
-        }
-      });
-      //半成品
-      getwproductList({ page: 0, step__process: this.process }).then(
-        (response) => {
+        getwproductList(this.wproductdata).then((response) => {
           if (response.data) {
             this.wproductData = response.data;
-            console.log(this.wproductData);
+            //console.log( this.wproductData)
           }
-        }
-      );
-    },
-
-    //领半成品
-    handlepick(scope) {
-      this.dialogTableVisiblepick = true;
-      this.spid = scope.row.id;
-      getpickhalfList(this.spid).then((res) => {
-        if (res.code >= 200) {
-          this.bcplist = res.data;
-        }
-      });
-    },
-    //根据半成品ID+检测状态调取未入库半成品
-    handleReceive(scope) {
-      this.dialogTableVisiblepicks = true;
-      this.bcpxlID = scope.row.id;
-      getwproductList({
-        material: scope.row.material,
-        act_state: 30,
-        page: 0,
-      }).then((res) => {
-        if (res.code >= 200) {
-          this.wproductslist = res.data;
-        }
-      });
-    },
-    handleSelectionChangess(val) {
-      this.bcpproducts = [];
-      val.forEach((item) => {
-        this.bcpproducts.push(item.id);
-      });
-    },
-    wproductSubmit() {
-      this.dialogTableVisiblepicks = false;
-
-      this.bcplist.forEach((item) => {
-        if (item.id == this.bcpxlID) {
-          item.iproducts = this.bcpproducts;
-        }
-      });
-    },
-
-    //提交领的半成品
-    bcpllSubmit() {
-      this.bcplists = []; //新的半成品表
-      this.bcplist.forEach((item) => {
-        this.bcplists.push({
-          id: item.id,
-          wproducts: item.iproducts,
         });
-      });
-      console.log(this.bcplists);
-      createpickhalf(this.spid, this.bcplists).then((res) => {
-        if (res.code >= 200) {
-          this.$message.success("半成品领料成功！");
-          this.dialogTableVisiblepick = false;
-          //车间物料表
-          this.getwproductLists();
-          // 半成品表
-          this.getwproductLists();
-        }
-      });
-    },
+      },
+      //调出该批次，该仓库的所有半成品
+      handlewproduct(scope) {
+        this.dialogTableVisible = true;
+        this.pcId = scope.row.id;
+        getiproductList({
+          page: 0,
+          material: scope.row.material,
+          warehouse: scope.row.warehouse,
+          batch: scope.row.batch,
+        }).then((response) => {
+          if (response.data) {
+            this.iproductData = response.data;
+          }
+        });
+      },
+      //勾选半成品
+      handleSelectionChanges(val) {
+        this.iproducts = [];
+        val.forEach((item) => {
+          this.iproducts.push(item.id);
+        });
+      },
+      //提交半成品
+      iproductsSubmit() {
+        this.dialogTableVisible = false;
+        this.havewl.forEach((item) => {
+          if (item.id == this.pcId) {
+            item.iproducts = this.iproducts;
+          }
+        });
+      },
 
-    prev() {
-      --this.values;
-      if (this.values < 0) this.values = 0;
-    },
-    next() {
-      if (this.values++ > this.forms.length) this.values = 0;
-    },
-    handleSelectionChange(val) {
-      this.count=val.length;
-      console.log(this.count);
-      let _this = this;
+      //领料
+      handleNeed(scope) {
+        this.need = Object.assign({}, defaulteneed);
+        this.dialogVisiblenw = true;
+        this.id = scope.row.id;
+        createPick_need(this.id, this.need).then((res) => {
+          if (res.code >= 200) {
+            this.havewl = res.data.have;
+            this.needwl = res.data.need;
+          }
+        });
+      },
 
-      _this.wpID = [];
-      val.forEach((item) => {
-        _this.wpID.push(item.id);
-      });
-    },
-    //车间操作
-    handlework(item) {
-      this.step = item.id;
-      // console.log(this.wpID);
-      this.values = 0;
-      this.Operation.step = item.id;
-      this.Operation.wproducts = this.wpID;
+      //确认领料
+      handlePick() {
+        this.pickData.subproduction_plan = this.id;
 
-      createOperation(this.Operation).then((res) => {
-        if (res.code >= 200) {
-          this.$message.success("操作记录创建成功！");
-          this.$router.push({ name: "operation", params: { id: item.id } });
-        }
-      });
-    },
+        this.pickData.picks = this.havewl;
 
-    //提交
-    submint() {
-      this.form = [];
-      this.otherforms.forEach((item) => {
+        createPick(this.pickData).then((res) => {
+          if (res.code >= 200) {
+            this.dialogVisiblenw = false;
+
+            this.$message.success("领料成功！");
+            //车间物料表
+            this.getwmaterialLists();
+            // 半成品表
+            this.getwproductLists();
+          }
+        });
+        //半成品
+        getwproductList({page: 0, step__process: this.process}).then(
+          (response) => {
+            if (response.data) {
+              this.wproductData = response.data;
+              console.log(this.wproductData);
+            }
+          }
+        );
+      },
+
+      //领半成品
+      handlepick(scope) {
+        this.dialogTableVisiblepick = true;
+        this.spid = scope.row.id;
+        getpickhalfList(this.spid).then((res) => {
+          if (res.code >= 200) {
+            this.bcplist = res.data;
+          }
+        });
+      },
+      //根据半成品ID+检测状态调取未入库半成品
+      handleReceive(scope) {
+        this.dialogTableVisiblepicks = true;
+        this.bcpxlID = scope.row.id;
+        getwproductList({
+          material: scope.row.material,
+          act_state: 30,
+          page: 0,
+        }).then((res) => {
+          if (res.code >= 200) {
+            this.wproductslist = res.data;
+          }
+        });
+      },
+      handleSelectionChangess(val) {
+        this.bcpproducts = [];
+        val.forEach((item) => {
+          this.bcpproducts.push(item.id);
+        });
+      },
+      wproductSubmit() {
+        this.dialogTableVisiblepicks = false;
+
+        this.bcplist.forEach((item) => {
+          if (item.id == this.bcpxlID) {
+            item.iproducts = this.bcpproducts;
+          }
+        });
+      },
+
+      //提交领的半成品
+      bcpllSubmit() {
+        this.bcplists = []; //新的半成品表
+        this.bcplist.forEach((item) => {
+          this.bcplists.push({
+            id: item.id,
+            wproducts: item.iproducts,
+          });
+        });
+        console.log(this.bcplists);
+        createpickhalf(this.spid, this.bcplists).then((res) => {
+          if (res.code >= 200) {
+            this.$message.success("半成品领料成功！");
+            this.dialogTableVisiblepick = false;
+            //车间物料表
+            this.getwproductLists();
+            // 半成品表
+            this.getwproductLists();
+          }
+        });
+      },
+
+      prev() {
+        --this.values;
+        if (this.values < 0) this.values = 0;
+      },
+      next() {
+        if (this.values++ > this.forms.length) this.values = 0;
+      },
+      handleSelectionChange(val) {
+        this.count = val.length;
+        console.log(this.count);
         let _this = this;
-        _this.field1 = [];
-        item.form_fields.forEach((items) => {
-          _this.field1.push({
-            form_field: items.id,
-            field_value: items.sort,
+
+        _this.wpID = [];
+        val.forEach((item) => {
+          _this.wpID.push(item.id);
+        });
+      },
+      //车间操作
+      handlework(item) {
+        this.step = item.id;
+        // console.log(this.wpID);
+        this.values = 0;
+        this.Operation.step = item.id;
+        this.Operation.wproducts = this.wpID;
+
+        createOperation(this.Operation).then((res) => {
+          if (res.code >= 200) {
+            this.$message.success("操作记录创建成功！");
+            this.$router.push({name: "operation", params: {id: item.id}});
+          }
+        });
+      },
+
+      //提交
+      submint() {
+        this.form = [];
+        this.otherforms.forEach((item) => {
+          let _this = this;
+          _this.field1 = [];
+          item.form_fields.forEach((items) => {
+            _this.field1.push({
+              form_field: items.id,
+              field_value: items.sort,
+            });
+          });
+
+          this.form.push({
+            form: item.id,
+            record_data: _this.field1,
           });
         });
 
-        this.form.push({
-          form: item.id,
-          record_data: _this.field1,
-        });
-      });
-
-      this.workData.step = this.step;
-      this.workData.wproducts = this.wproducts;
-      this.workData.input = this.input;
-      this.workData.output = this.output;
-      this.workData.forms = this.from;
-      this.workData.remark = this.remark;
-      if (this.subproduction_plan != "") {
-        this.wproductdata.subproduction_plan = this.subproduction_plan;
-      }
-      console.log(this.remark);
-
-      submitWork(this.workData).then((res) => {
-        if (res.code >= 200) {
-          this.dialogVisiblework = false;
-          this.$message.success("成功！");
-          this.getwproductLists();
+        this.workData.step = this.step;
+        this.workData.wproducts = this.wproducts;
+        this.workData.input = this.input;
+        this.workData.output = this.output;
+        this.workData.forms = this.from;
+        this.workData.remark = this.remark;
+        if (this.subproduction_plan != "") {
+          this.wproductdata.subproduction_plan = this.subproduction_plan;
         }
-      });
+        console.log(this.remark);
+
+        submitWork(this.workData).then((res) => {
+          if (res.code >= 200) {
+            this.dialogVisiblework = false;
+            this.$message.success("成功！");
+            this.getwproductLists();
+          }
+        });
+      },
     },
-  },
-};
-</script>
\ No newline at end of file
+  };
+</script>