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

hb_client/src/router/index.js

@@ -348,7 +348,7 @@ export const asyncRoutes = [
     component: Layout,
     redirect: '/qm/product',
     name: 'qm',
-    meta: { title: '质量管理', icon: 'example', perms: ['equipment_set'] },
+    meta: { title: '检验管理', icon: 'example', perms: ['equipment_set'] },
     children: [
       {
         path: 'product',

hb_client/src/views/inm/fifo.vue

@@ -100,6 +100,7 @@
     <el-dialog
       :visible.sync="dialogVisible"
       :close-on-click-modal="false"
+      width="90%"
       :title="dialogType === 'edit' ? '编辑出/如库记录' : '新增出/如库记录'"
     >
       <el-form
@@ -110,20 +111,11 @@
         :rules="rule1"
       >
         
-        <el-form-item label="入库时间" prop="inout_date">
+      
-          <el-date-picker
-            v-model="inventory.inout_date"
-            type="date"
-            placeholder="选择日期"
-            value-format="yyyy-MM-dd"
-            style="width: 100%"
-          >
-          </el-date-picker>
-        </el-form-item>
 
         <div v-for="(item, index) in inventory.details" :key="index">
           <el-row>
-             <el-col :span="6" style="margin-right: 10px">
+             <el-col :span="5" style="margin-right: 10px">
               <el-form-item
                 class="warehouse"
                 label="仓库："
@@ -141,7 +133,7 @@
               </el-form-item>
             </el-col>
             
-            <el-col :span="6" style="margin-right: 10px">
+            <el-col :span="5" style="margin-right: 10px">
               <el-form-item
                 class="material"
                 label="物料："
@@ -159,7 +151,7 @@
               </el-form-item>
             </el-col>
 
-            <el-col :span="6" style="margin-right: 10px">
+            <el-col :span="5" style="margin-right: 10px">
               <el-form-item
                 class="count"
                 label="数量"
@@ -171,7 +163,7 @@
                 ></el-input-number>
               </el-form-item>
             </el-col>
-            <el-col :span="6" style="margin-right: 10px">
+            <el-col :span="5" style="margin-right: 10px">
               <el-form-item
                 class="batch"
                 label="批次"

hb_client/src/views/inm/fifodetail.vue

@@ -35,14 +35,14 @@
         <el-table-column label="入库数量">
           <template slot-scope="scope">{{ scope.row.count }}</template>
         </el-table-column>
-        <el-table-column label="是否检查">
+        <el-table-column label="是否需要复验">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.is_tested == false">未检查</el-tag>
+            <el-tag v-if="scope.row.need_test == false">否</el-tag>
-            <el-tag v-else>已检查</el-tag>
+            <el-tag v-else>是</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="检查是否合格">
+        <el-table-column label="复验是否合格">
-          <template slot-scope="scope" v-if="scope.row.is_tested == true">
+          <template slot-scope="scope">
             <el-tag v-if="scope.row.is_testok == false">不合格</el-tag>
             <el-tag v-else>合格</el-tag>
           </template>
@@ -51,10 +51,16 @@
         <el-table-column align="center" label="操作" width="220px">
           <template slot-scope="scope">
             <el-link
-              v-if="scope.row.is_tested == false"
+             
                type="primary"
               @click="handleMaterial(scope)"
-              >检查</el-link
+              >复验</el-link
+            >
+            <el-link
+             
+               type="primary"
+              @click="handlefile(scope)"
+              >上传</el-link
             >
           </template>
         </el-table-column>
@@ -262,6 +268,11 @@ export default {
         }
         this.listLoading = false;
       });
+    },
+    //上传物料文件
+    handlefile(scope)
+    {
+
     },
     handleMaterial(scope) {
       //调该物料对应的检查表

hb_client/src/views/mtm/materialDetail.vue

@@ -12,7 +12,10 @@
    
  
 </el-card>
-    <el-tabs v-model="activeName" type="card" >
+
+    <el-tabs v-model="activeName" type="card">
+        <el-tab-pane label="供应商" name="5"  v-if="this.type==3||this.type==4">
+        </el-tab-pane>
          <el-tab-pane label="批次" name="3">
 
  <el-table

hb_client/src/views/pm/plan.vue

@@ -350,6 +350,7 @@
         this.dialogVisible = true;
         this.$nextTick(() => {
           this.$refs["Form"].resetFields();
+          this.value1="";
         });
 
       },

hb_client/src/views/pm/plandetails.vue

@@ -75,7 +75,7 @@
               </el-table>
 
        <!--检验记录-->
-    <el-dialog title="检验记录" :close-on-click-modal="false" :visible.sync="limitedCheckRecord">
+    <el-dialog title="检验记录" :visible.sync="limitedCheckRecord">
       <el-table
         :data="recordList"
         border
@@ -89,28 +89,42 @@
       
         <el-table-column align="center" label="操作">
           <template slot-scope="scope">
+           
             <el-link
-              v-if="!scope.row.is_submited"
+             
-              @click="handleInspectionRecord(scope)"
-            >检验
-            </el-link>
-            <el-link
-              v-else
               @click="handleRecordDetail(scope)"
             >查看
             </el-link>
-            <el-link
+          
-              @click="delTestRecord(scope)"
-            >删除
-            </el-link>
           </template>
         </el-table-column>
       </el-table>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible = false">取 消</el-button>
-        <el-button type="primary" @click="putin">确 定</el-button>
+      
       </div>
     </el-dialog>
+      <!--非检查表显示-->
+      <el-dialog
+        width="60%"
+        :title="formName"
+        :visible.sync="recordVisible"
+        :close-on-click-modal="false"
+        @close="recordCancel"
+      >
+        <customForm
+          v-if="recordVisible"
+          :results="fieldList"
+          :hasPicture="hasPicture"
+          :formID="recordform"
+          :wproduct="wproduct"
+          :recordId="recordId"
+          :isDisabled="isDisabled"
+          @recordSubmit="recordSubmit"
+          @recordSave="recordSave"
+          @recordCancel="recordCancel"
+        />
+      </el-dialog>
     </el-card>
 
   
@@ -123,12 +137,14 @@
 import { getProductionplan,getsubproductionplanList } from "@/api/pm";
 import {  getwproductList,getrecordList} from "@/api/wpm";
 import checkPermission from "@/utils/permission";
+import customForm from '@/components/customForm/index'
+import {getrffieldList} from "@/api/mtm";
 
-import {getTestRecord} from "@/api/qm";
+import { getTestRecord ,getTestRecordItem} from "@/api/qm";
 import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-
+const defaultrecordform = {enabled:false};
 export default {
-  components: { Pagination },
+  components: { Pagination,customForm },
   data() {
     return {
      productionplan:{
@@ -136,6 +152,7 @@ export default {
      },
      activeName:"1",
      wproduct:[],
+     recordList:[],
     limitedCheckRecord:false,
       listQuery: {
         page: 1,
@@ -162,6 +179,30 @@ export default {
       },
       process_json:null,
       productionplanID:null,
+       dialogVisibleForm: false,
+          tableForm:{
+          name:'',
+        },
+        
+        recordform: defaultrecordform,
+        dialogType: "new",
+        dialogVisible: false,
+        dialogType1: "new",
+        dialogVisible1: false,
+        tableForm: defaultrecordform,
+        checkForm: {
+          hhh: '',
+        },
+         
+        recordVisible: false,
+      customfieldList: [],
+      recordform: null,
+      recordId: null,
+      fifo_detail: "",
+      formName: "项目检查表",
+      hasPicture: false,
+      fieldList: [],
+           
     };
   },
   computed: {},
@@ -217,10 +258,56 @@ export default {
      this.limitedCheckRecord=true;
        getrecordList({wproduct: scope.row.id,page:0}).then(res => {
           if (res.code == 200) {
-            that.recordList = res.data.results;
+            this.recordList = res.data;
           } 
         })
-   }
+   },
+   
+  //点击记录里的查看
+    handleRecordDetail(scope) {
+      let that = this;
+      that.recordVisible = false;
+      that.recordId = scope.row.id;
+      that.recordform = scope.row.form;
+      that.formName = scope.row.form_.name;
+      getrffieldList({ form: this.recordform, page: 1, page_size: 100 }).then(
+        (response) => {
+          if (response.data) {
+            that.hasPicture = false;
+            let fieldList = response.data.results;
+            that.fieldList = [...fieldList];
+            let arr = fieldList.filter((item) => {
+              return item.field_type === "draw";
+            });
+            if (arr.length > 0) {
+              that.hasPicture = true;
+            }
+            getTestRecordItem(scope.row.id).then((res) => {
+              let arr = [];
+              let fieldList = res.data.record_data;
+              for (let i = 0; i < that.fieldList.length; i++) {
+                let obj = that.fieldList[i];
+                obj.is_testok = null;
+                for (let j = 0; j < fieldList.length; j++) {
+                  if (that.fieldList[i].field_key === fieldList[j].field_key) {
+                    obj.id = fieldList[j].id;
+                    obj.is_testok = fieldList[j].is_testok;
+                    obj.field_value = fieldList[j].field_value;
+                  }
+                }
+                arr.push(obj);
+              }
+              that.fieldList = arr;
+              that.$nextTick(() => {
+                that.isDisabled = true;
+                that.recordVisible = true;
+              });
+            });
+          }
+        }
+      );
+    },
+  
   },
 };
 </script>

hb_client/src/views/pm/work.vue

@@ -165,7 +165,7 @@
           <template slot-scope="scope">{{ scope.row.count_real }}</template>
         </el-table-column>
         <el-table-column label="生产计划编号">
-          <template slot-scope="scope">{{ scope.row.subproduction_plan }}</template>
+          <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>
@@ -200,7 +200,7 @@
           <template slot-scope="scope">{{ scope.row.count_real }}</template>
         </el-table-column>
         <el-table-column label="生产计划编号">
-          <template slot-scope="scope">{{ scope.row.subproduction_plan }}</template>
+          <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>
@@ -309,7 +309,8 @@ export default {
                      {
                          this.xhwl.push(item);
                      }
-                     else{
+                     else if(item.type==2)
+                     {
                        this.ccwl.push(item);
                      }
         

hb_client/src/views/qm/producttest.vue

@@ -153,14 +153,12 @@
 import { getfifodetailList } from "@/api/inm";
 import checkPermission from "@/utils/permission";
 import { mtest,getwproductList } from "@/api/wpm";
-
-  import customForm from '@/components/customForm/index';
   import { getrecordformList, getrffieldList} from "@/api/mtm";
   import {getTestRecord,getTestRecordItem} from "@/api/qm";
 import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
 
 export default {
-  components: { Pagination,customForm },
+  components: { Pagination },
   data() {
     return {
          wproductList: {

hb_client/src/views/qm/taskdetails.vue

@@ -6,7 +6,7 @@
   <el-descriptions-item label="产品名称" v-if="productionplan.product_">{{productionplan.product_.name}}</el-descriptions-item>
   <el-descriptions-item label="规格型号" v-if="productionplan.product_">{{productionplan.product_.specification}}</el-descriptions-item>
   <el-descriptions-item label="生产状态">{{state_[productionplan.state]}}</el-descriptions-item>
-   <el-descriptions-item label="不合格品数量">不合格数没有</el-descriptions-item>
+   <el-descriptions-item label="不合格品数量">{{productionplan.count_notok}}</el-descriptions-item>
 </el-descriptions>
  <el-card  style="margin-bottom: 20px">
       <div slot="header" class="clearfix">

hb_client/src/views/qm/taskrecordfrom.vue

@@ -6,7 +6,7 @@
   <el-descriptions-item label="产品名称" v-if="productionplan.product_">{{productionplan.product_.name}}</el-descriptions-item>
   <el-descriptions-item label="规格型号" v-if="productionplan.product_">{{productionplan.product_.specification}}</el-descriptions-item>
   <el-descriptions-item label="生产状态">{{state_[productionplan.state]}}</el-descriptions-item>
-   <el-descriptions-item label="不合格品数量">不合格数没有</el-descriptions-item>
+   <el-descriptions-item label="不合格品数量">{{productionplan.count_notok}}</el-descriptions-item>
     <el-descriptions-item label="玻璃编号">{{wproductnumber}}</el-descriptions-item>
      <el-descriptions-item label="玻璃所在子工序">{{process}}</el-descriptions-item>
     

hb_client/src/views/wpm/operation.vue

@@ -50,8 +50,8 @@
          
         </el-table-column>
         <el-table-column label="产品数量">
-           <template slot-scope="scope" v-if="scope.row.wproduct_">
+           <template slot-scope="scope" >
-             {{ scope.row.wproduct_.length }}
+             {{ scope.row.count_work }}
            
        </template>
         </el-table-column>
@@ -136,7 +136,7 @@ export default {
    
 handleoperation(scope)
 {
-       this.$router.push({name: "operationdo", params: { id: scope.row.id,submited:scope.row.is_submited }, })
+       this.$router.push({name: "operationdo", params: { id: scope.row.id}, })
 },
   //大工序工序渲染
     getProcessList() {

hb_client/src/views/wpm/operationdo.vue

@@ -132,6 +132,23 @@
                 </el-table-column>
                 <el-table-column prop="equip_.name" label="设备名称">
                 </el-table-column>
+                   <el-table-column  label="设备状态">
+                      <template slot-scope="scope">
+            <el-tag v-if="scope.row.state===0" type="success">
+            {{ state_[scope.row.equip_.state] }}
+            </el-tag>
+            <el-tag v-else-if="scope.row.state===1" type="warning">
+            {{ state_[scope.row.equip_.state] }}
+            </el-tag>
+            <el-tag v-else-if="scope.row.state===2" >
+            {{ state_[scope.row.equip_.state] }}
+            </el-tag>
+             <el-tag v-else type="danger">
+            {{ state_[scope.row.equip_.state] }}
+            </el-tag>
+            </template>
+                </el-table-column>
+                
                 <el-table-column align="center" label="操作" width="100px">
                   <template slot-scope="scope">
                     <el-link
@@ -463,9 +480,9 @@
     </el-table-column>
                 <el-table-column type="index" width="50" />
 
-                <el-table-column label="生产计划编号">
+                <el-table-column label="子计划编号">
                   <template slot-scope="scope">{{
-                    scope.row.subproduction_plan
+                    scope.row.subproduction_plan_.number
                   }}</template>
                 </el-table-column>
                 <el-table-column label="物料名称">
@@ -604,6 +621,12 @@ export default {
       listQuery: {
         page: 1,
         page_size: 20,
+      },
+       state_:{
+        0:'完好',
+        1:'限用',
+        2:'在修',
+        3:'禁用',
       },
       scrap: [
         { lable: "使用", value: true },