Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop

hb_client/src/router/index.js

@@ -250,7 +250,7 @@ export const asyncRoutes = [
         path: 'firstCheck',
         name: 'firstCheck',
         component: () => import('@/views/wpm/firstCheck'),
-        meta: { title: '首件确认', icon: 'finishedCheck', perms: ['wpm_firstCheck'] }
+        meta: { title: '首件确认', icon: 'finishedCheck', perms: ['wpm_firstCheck'] ,noCache: true}
       }
 
     ]

hb_client/src/views/bigScreen/index.vue

@@ -121,6 +121,10 @@
       bottomLeft,
       bottomRight
     },
+    created(){
+      window.open('http://49.232.14.174:2222/#/index');
+      this.$router.go(-1)
+    },
     mounted() {
       this.timeFn();
       this.cancelLoading();

hb_client/src/views/system/perm.vue

@@ -86,10 +86,10 @@
         <el-form-item label="名称" prop="name">
           <el-input v-model="perm.name" placeholder="名称" />
         </el-form-item>
-        <el-form-item label="代号" prop="method">
+        <el-form-item label="代号">
           <el-input v-model="perm.method" placeholder="代号" />
         </el-form-item>
-        <el-form-item label="父级" prop="parent">
+        <el-form-item label="父级">
           <treeselect
             v-model="perm.parent"
             :multiple="false"

hb_client/src/views/wpm/need.vue

@@ -1,8 +1,29 @@
 <template>
   <div class="app-container">
-    <el-tabs type="border-card">
+    <el-tabs type="border-card"  v-model="activeName" @tab-click="handleClick">
-      <el-tab-pane label="待检半成品">
+      <el-tab-pane label="待检半成品" name="1">
         <el-card style="margin-top: 2px">
+            <el-input
+          v-model="listQuery.search"
+          placeholder="半成品名称/编号/子计划编号/工序"
+          style="width: 300px"
+          class="filter-item"
+          @keyup.enter.native="handleFilter1"
+        />
+        <el-button
+          class="filter-item"
+          type="primary"
+          icon="el-icon-search"
+          @click="handleFilter1"
+        >搜索
+        </el-button>
+        <el-button
+          class="filter-item"
+          type="primary"
+          icon="el-icon-refresh-left"
+          @click="resetFilter"
+        >重置
+        </el-button>
           <el-table
             v-loading="listLoading"
             :data="wproductList.results"
@@ -24,7 +45,8 @@
               <template slot-scope="scope">{{ scope.row.material_.specification }}</template>
             </el-table-column>
             
-            <el-table-column label="检测状态">
+            <el-table-column label="检测状态"
+            >
               <template slot-scope="scope">
                 {{ actstate_[scope.row.act_state] }}
               </template>
@@ -32,7 +54,12 @@
              <el-table-column label="子计划编号">
               <template slot-scope="scope">{{ scope.row.subproduction_plan_.number }}</template>
             </el-table-column>
-            <el-table-column label="所在子工序">
+            <el-table-column label="所在子工序"  :filters="[{ text: '切割', value: '切割' },{ text: '磨边', value: '磨边' },
+            { text: '清洗', value: '清洗' }, { text: '热弯成型', value: '热弯成型' },{ text: '化学钢化', value: '化学钢化' },
+            { text: '镀膜', value: '镀膜' }, { text: '断膜', value: '断膜' },{ text: '汇流条制备', value: '汇流条制备' },
+            { text: '夹层', value: '夹层' }, { text: '包边', value: '包边' }]"
+      :filter-method="filterTag"
+      filter-placement="bottom-end">
               <template slot-scope="scope">{{ scope.row.step_.name }}</template>
             </el-table-column>
             <el-table-column align="center" label="操作" width="220px">
@@ -89,10 +116,31 @@
           </el-dialog>
         </el-card>
       </el-tab-pane>
-      <el-tab-pane label="复检半成品">
+      <el-tab-pane label="复检半成品" name="2">
         <el-card style="margin-top: 2px">
+          <el-input
+          v-model="listQuery2.search"
+          placeholder="半成品名称/编号/子计划编号/工序"
+          style="width: 300px"
+          class="filter-item"
+          @keyup.enter.native="handleFilter2"
+        />
+        <el-button
+          class="filter-item"
+          type="primary"
+          icon="el-icon-search"
+          @click="handleFilter2"
+        >搜索
+        </el-button>
+        <el-button
+          class="filter-item"
+          type="primary"
+          icon="el-icon-refresh-left"
+          @click="resetFilter2"
+        >重置
+        </el-button>
           <el-table
-            v-loading="listLoading"
+           
             :data="wproductList2.results"
             border
             fit
@@ -121,7 +169,12 @@
              <el-table-column label="子计划编号">
               <template slot-scope="scope">{{ scope.row.subproduction_plan_.number }}</template>
             </el-table-column>
-            <el-table-column label="所在子工序">
+            <el-table-column label="所在子工序"
+            :filters="[{ text: '切割', value: '切割' },{ text: '磨边', value: '磨边' },
+            { text: '清洗', value: '清洗' }, { text: '热弯成型', value: '热弯成型' },{ text: '化学钢化', value: '化学钢化' },
+            { text: '镀膜', value: '镀膜' }, { text: '断膜', value: '断膜' },{ text: '汇流条制备', value: '汇流条制备' },
+            { text: '夹层', value: '夹层' }, { text: '包边', value: '包边' }]"
+      :filter-method="filterTag">
               <template slot-scope="scope">{{ scope.row.step_.name }}</template>
             </el-table-column>
             <el-table-column align="center" label="操作" width="220px">
@@ -148,13 +201,34 @@
           />
         </el-card>
       </el-tab-pane>
-      <el-tab-pane label="已合格半成品">
+      <el-tab-pane label="已合格半成品" name="3">
         <el-card style="margin-top: 2px">
           <el-button type="primary" icon="el-icon-plus" @click="handleCreate">
             批量入库
           </el-button>
+            <el-input
+          v-model="listQuery1.search"
+          placeholder="半成品名称/编号/子计划编号/工序"
+          style="width: 300px"
+          class="filter-item"
+          @keyup.enter.native="handleFilter3"
+        />
+        <el-button
+          class="filter-item"
+          type="primary"
+          icon="el-icon-search"
+          @click="handleFilter3"
+        >搜索
+        </el-button>
+        <el-button
+          class="filter-item"
+          type="primary"
+          icon="el-icon-refresh-left"
+          @click="resetFilter3"
+        >重置
+        </el-button>
           <el-table
-            v-loading="listLoading"
+           
             :data="wproductList1.results"
             ref="multipleTable"
             border
@@ -188,7 +262,12 @@
  <el-table-column label="子计划编号">
               <template slot-scope="scope">{{ scope.row.subproduction_plan_.number }}</template>
             </el-table-column>
-            <el-table-column label="所在子工序">
+            <el-table-column label="所在子工序"
+             :filters="[{ text: '切割', value: '切割' },{ text: '磨边', value: '磨边' },
+            { text: '清洗', value: '清洗' }, { text: '热弯成型', value: '热弯成型' },{ text: '化学钢化', value: '化学钢化' },
+            { text: '镀膜', value: '镀膜' }, { text: '断膜', value: '断膜' },{ text: '汇流条制备', value: '汇流条制备' },
+            { text: '夹层', value: '夹层' }, { text: '包边', value: '包边' }]"
+      :filter-method="filterTag">
               <template slot-scope="scope">{{ scope.row.step_.name }}</template>
             </el-table-column>
 
@@ -216,10 +295,31 @@
           />
         </el-card>
       </el-tab-pane>
-      <el-tab-pane label="不合格半成品">
+      <el-tab-pane label="不合格半成品" name="4">
         <el-card style="margin-top: 2px">
+           <el-input
+          v-model="listQuery4.search"
+          placeholder="半成品名称/编号/子计划编号/工序"
+          style="width: 300px"
+          class="filter-item"
+          @keyup.enter.native="handleFilter4"
+        />
+        <el-button
+          class="filter-item"
+          type="primary"
+          icon="el-icon-search"
+          @click="handleFilter4"
+        >搜索
+        </el-button>
+        <el-button
+          class="filter-item"
+          type="primary"
+          icon="el-icon-refresh-left"
+          @click="resetFilter4"
+        >重置
+        </el-button>
           <el-table
-            v-loading="listLoading"
+         
             :data="wproductList4.results"
             border
             fit
@@ -244,7 +344,11 @@
              <el-table-column label="规格型号">
               <template slot-scope="scope">{{ scope.row.material_.specification }}</template>
             </el-table-column>
-            <el-table-column label="所在子工序">
+            <el-table-column label="所在子工序" :filters="[{ text: '切割', value: '切割' },{ text: '磨边', value: '磨边' },
+            { text: '清洗', value: '清洗' }, { text: '热弯成型', value: '热弯成型' },{ text: '化学钢化', value: '化学钢化' },
+            { text: '镀膜', value: '镀膜' }, { text: '断膜', value: '断膜' },{ text: '汇流条制备', value: '汇流条制备' },
+            { text: '夹层', value: '夹层' }, { text: '包边', value: '包边' }]"
+      :filter-method="filterTag">
               <template slot-scope="scope">{{ scope.row.step_.name }}</template>
             </el-table-column>
             <el-table-column label="不合格标记">
@@ -283,10 +387,10 @@
           />
         </el-card>
       </el-tab-pane>
-      <el-tab-pane label="夹层半成品">
+      <el-tab-pane label="夹层半成品" name="5">
         <el-card style="margin-top: 2px">
           <el-table
-            v-loading="listLoading"
+         
             :data="wproductList3.results"
             border
             fit
@@ -316,7 +420,11 @@
  <el-table-column label="子计划编号">
               <template slot-scope="scope">{{ scope.row.subproduction_plan_.number }}</template>
             </el-table-column>
-            <el-table-column label="所在子工序">
+            <el-table-column label="所在子工序"  :filters="[{ text: '切割', value: '切割' },{ text: '磨边', value: '磨边' },
+            { text: '清洗', value: '清洗' }, { text: '热弯成型', value: '热弯成型' },{ text: '化学钢化', value: '化学钢化' },
+            { text: '镀膜', value: '镀膜' }, { text: '断膜', value: '断膜' },{ text: '汇流条制备', value: '汇流条制备' },
+            { text: '夹层', value: '夹层' }, { text: '包边', value: '包边' }]"
+      :filter-method="filterTag">
               <template slot-scope="scope">{{ scope.row.step_.name }}</template>
             </el-table-column>
             <el-table-column align="center" label="操作" width="220px">
@@ -516,7 +624,7 @@
         </el-table-column>
       </el-table>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button @click="limitedCheckRecord = false">取 消</el-button>
         <el-button type="primary" @click="putin">确 定</el-button>
       </div>
     </el-dialog>
@@ -721,6 +829,7 @@
           page: 1,
           page_size: 20,
         },
+         activeName: "1",
         create_by_: '',
         update_time: '',
         formLabelWidth: '',
@@ -825,15 +934,40 @@
     computed: {},
     watch: {},
     created() {
-      this.getList();
+      this.getList();//待检
-      this.getList2();
+      this.getList2();//复检
-      this.getList1();
+      this.getList1();//已合格
-      this.getList3();
+      this.getList3();//夹层
-      this.getList4();
+      this.getList4();//不合格
       // this.getLists();
     },
     methods: {
       checkPermission,
+       handleClick(tab) {
+        this.listLoading = true;
+        this.listQuery.type = tab.name;
+        if(tab.name==1)
+        {
+           this.getList();
+        }
+        else if(tab.name==2)
+        {
+           this.getList2();
+        }
+          else if(tab.name==3)
+        {
+           this.getList1();
+        }
+          else if(tab.name==4)
+        {
+           this.getList4();
+        }
+          else if(tab.name==5)
+        {
+           this.getList3();
+        }
+       
+      },
       //待检半成品列表
       getList() {
         this.listLoading = true;
@@ -844,6 +978,18 @@
           }
           this.listLoading = false;
         });
+      },
+        handleFilter1() {
+        this.listQuery.page = 1;
+        this.getList();
+      },
+      resetFilter1() {
+      
+        this.listQuery = {
+          page: 1,
+          page_size: 20,
+        };
+        this.getList();
       },
       //待检半成品报废
       handleScrapbcp(scope) {
@@ -872,6 +1018,18 @@
             this.wproductList2 = response.data;
           }
         });
+      },
+        handleFilter2() {
+        this.listQuery2.page = 1;
+        this.getList2();
+      },
+      resetFilter2() {
+       
+        this.listQuery2 = {
+          page: 1,
+          page_size: 20,
+        };
+        this.getList2();
       },
       //已合格半成品
       getList1() {
@@ -883,6 +1041,18 @@
           }
 
         });
+      },
+        handleFilter3() {
+        this.listQuery1.page = 1;
+        this.getList1();
+      },
+      resetFilter3() {
+       
+        this.listQuery1 = {
+          page: 1,
+          page_size: 20,
+        };
+        this.getList1();
       },
       //不合格半成品
       getList4() {
@@ -894,6 +1064,18 @@
           }
 
         });
+      },
+        handleFilter4() {
+        this.listQuery4.page = 1;
+        this.getList4();
+      },
+      resetFilter4() {
+       
+        this.listQuery4 = {
+          page: 1,
+          page_size: 20,
+        };
+        this.getList4();
       },
       //不合格半成品报废
       handleScrap(scope) {
@@ -969,6 +1151,10 @@
           }
         });
       },
+      //筛选
+        filterTag(value, row) {
+        return row.step_.name === value;
+      },
       //夹层半成品列表
       getList3() {
         this.listQuery3.act_state = 26;

hb_client/src/views/wpm/operationdo.vue

@@ -1144,12 +1144,33 @@ export default {
 
     //提交本次操作
     handlesubmit() {
-      submitOperation(this.id).then((res) => {
+     
+      
+      if(this.inputData=="")
+      {
+         this.$confirm("没有消耗物料确定提交吗?", "提示", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+          type: "error",
+        })
+          .then(async () => {
+            await submitOperation(this.id);
+            this.$router.push({ name: "operation" });
+          this.$message.success("操作提交成功！");
+          })
+          .catch((err) => {
+            console.error(err);
+          });
+      }
+      else{
+          submitOperation(this.id).then((res) => {
         if (res.code >= 200) {
           this.$router.push({ name: "operation" });
           this.$message.success("操作提交成功！");
         }
       });
+      }
+     
     },
   },
 };