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

hb_client/src/components/customForm/index.vue

@@ -132,7 +132,6 @@
         <el-form-item label="图表">
           <div>
             <img id="canvasImg" :src="img" style="width:500px;height: 300px;display: none">
-            <!--<img id="canvasImg" src="./../../assets/glass.png" style="width:500px;height: 300px;display: none">-->
             <div style="position: relative;display: flex;flex-direction: column;
                  border: 1px solid #DCDFE6;">
               <canvas id="canvas" width="500" height="300">
@@ -200,6 +199,8 @@
       }
     },
     mounted() {
+      debugger;
+      debugger;
       let that = this;
       that.checkForm = {};
       this.form = this.formID;
@@ -232,17 +233,20 @@
       let listJudge = this.formData.filter(item => {
         return item.need_judge === true;
       });
+      debugger;
       listJudge.forEach(item => {
         let obj = new Object();
         obj = item;
         that.judgeList.push(obj)
       });
+      debugger;
       let  imag= this.formData.filter(item => {
         return item.field_type === 'draw';
       });
       that.img = new Image();
-      that.img.crossOrigin = '';
+      that.img.crossOrigin = 'anonymous';
-      that.img = 'http://47.95.0.242:2222'+imag[0].draw_template;
+      let value = imag[0].field_value?imag[0].field_value:imag[0].draw_template;
+      that.img = 'http://47.95.0.242:2222'+value;
       setTimeout(function(){
         that.canvasInit();
       },500);

hb_client/src/views/mtm/materialdo.vue

@@ -97,6 +97,7 @@
                 :results="fieldList.results"
                 :hasPicture="hasPicture"
                 :formID="formID"
+                :isDisabled="isDisabled"
                 @formFunc="formFunc"
               />
               <!--<el-form ref="Forms" label-width="100px" :model="checkForm">
@@ -695,7 +696,8 @@
         imgData: '',
         canvasImg: '',
         judgeList: [],
-        limitedPhoto:false
+        limitedPhoto:false,
+        isDisabled:true,
       };
     },
     computed: {},

hb_client/src/views/qm/producttest.vue

@@ -1,9 +1,7 @@
 <template>
   <div class="app-container">
     <el-card style="margin-top: 2px">
-     
       <el-table
-           
         :data="wproductList.results"
         border
         fit
@@ -15,9 +13,9 @@
         <el-table-column label="产品编号">
           <template slot-scope="scope">{{ scope.row.number }}</template>
         </el-table-column>
-
         <el-table-column label="任务编号">
-              <template slot-scope="scope" v-if="scope.row.subproduction_plan_">{{ scope.row.subproduction_plan_.number }}</template>
+          <template slot-scope="scope" v-if="scope.row.subproduction_plan_">{{ scope.row.subproduction_plan_.number }}
+          </template>
         </el-table-column>
         <el-table-column label="产品名称">
           <template slot-scope="scope" v-if="scope.row.material_">{{ scope.row.material_.name }}</template>
@@ -25,18 +23,17 @@
         <el-table-column label="型号规格">
           <template slot-scope="scope" v-if="scope.row.material_">{{ scope.row.material_.specification }}</template>
         </el-table-column>
-               
         <el-table-column label="军检状态">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.is_mtested==false">未军检</el-tag>
             <el-tag v-if="scope.row.is_mtested==true">已军检</el-tag>
-              
           </template>
         </el-table-column>
         <el-table-column label="军检结论">
-                    
+          <template slot-scope="scope">
-              <template slot-scope="scope"><el-tag v-if="scope.row.is_mtestok==false">不合格</el-tag>
+            <el-tag v-if="scope.row.is_mtestok==false">不合格</el-tag>
-            <el-tag v-if="scope.row.is_mtestok==true">合格</el-tag></template>
+            <el-tag v-if="scope.row.is_mtestok==true">合格</el-tag>
+          </template>
         </el-table-column>
         <el-table-column label="仓库">
           <template slot-scope="scope" v-if="scope.row.warehouse_">{{ scope.row.warehouse_.name }}</template>
@@ -47,8 +44,6 @@
         <el-table-column label="检查状态">
           <template slot-scope="scope">{{ actstate_[scope.row.act_state]}}</template>
         </el-table-column>
-           
-
         <el-table-column align="center" label="操作" width="220px">
           <template slot-scope="scope">
             <el-link
@@ -57,7 +52,6 @@
             >军检
             </el-link>
             <el-link
-                 
               @click="checkRecord(scope)"
             >检验记录
             </el-link>
@@ -72,15 +66,17 @@
         @pagination="getList"
       />
       <el-dialog title="军检" :visible.sync="dialogVisible">
-  <el-form :model="mtestform"  label-width="130px"
+        <el-form
-        label-position="right">
+          :model="mtestform"
+          label-width="130px"
+          label-position="right"
+        >
           <el-form-item label="是否军检合格" prop="name">
             <el-switch v-model="mtestform.is_mtestok"></el-switch>
           </el-form-item>
           <el-form-item label="军检备注" prop="name">
             <el-input type="textarea" v-model="mtestform.remark_mtest"></el-input>
           </el-form-item>
-  
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button @click="dialogVisible = false">取 消</el-button>
@@ -108,45 +104,33 @@
           </el-table-column>
           <el-table-column align="center" label="操作">
             <template slot-scope="scope">
-           
               <el-link
                 @click="handleRecordDetail(scope)"
               >查看
               </el-link>
-          
             </template>
           </el-table-column>
         </el-table>
         <div slot="footer" class="dialog-footer">
           <el-button @click="dialogFormVisible = false">取 消</el-button>
-       
         </div>
       </el-dialog>
       <el-dialog
-      width="60%"
         :title="formName"
         :visible.sync="recordVisible"
         :close-on-click-modal="false"
         @close="recordCancel"
       >
-      <customForm
+        <el-row>
-        v-if="recordVisible"
+          <el-col v-for="item in fieldList" :key="item.id" :span="12">
-        :results="fieldList"
+            <div class="items">
-        :hasPicture="hasPicture"
+              <span class="itemLabel">{{item.field_name}}：</span>
-        :formID="recordform"
+              <span>{{item.field_value}}</span>
-        :wproduct="wproduct"
+            </div>
-        :recordId="recordId"
+          </el-col>
-        :isDisabled="isDisabled"
+        </el-row>
-        @recordSubmit="recordSubmit"
-        @recordSave="recordSave"
-        @recordCancel="recordCancel"
-      />
       </el-dialog>
     </el-card>
-
-  
-
-    
   </div>
 </template>
 <script>
@@ -164,12 +148,10 @@ export default {
          wproductList: {
           count: 0,
         },
-    
         listQuery: {
           page: 1,
           page_size: 20,
         },
-      
         checkTypes: {
           10: "子工序检验",
           20: "工序检验",
@@ -196,7 +178,6 @@ export default {
           is_mtestok: false,
         },
         wproduct: null,
-       limitedCheckRecord: false,
         recordList: [],
         fieldList: [],
         is_testok: "true",
@@ -215,7 +196,6 @@ export default {
         dialogFormVisibles: false,
         limitedCheckRecord: false,
         testrecord: {},
-       
         WarehouseData: "",
         formName: '项目检查表',
       };
@@ -227,30 +207,22 @@ export default {
     },
     methods: {
       checkPermission,
-
-   
-   
       //待检成品列表
       getList() {
-       
-     
         this.listQuery.material__type = 1;
         getwproductList(this.listQuery).then((response) => {
           if (response.data) {
             this.wproductList = response.data;
           }
-         
         });
       },
       handleMtest(scope) {
-
         this.saleproduct = scope.row.id;
         this.dialogVisible = true;
       },
       submtest() {
         mtest(this.saleproduct, this.mtestform).then((res) => {
-            if(res.code >= 200)
+          if (res.code >= 200) {
-            {
             this.$message.success("提交成功！");
             this.dialogVisible = false;
           }
@@ -273,45 +245,28 @@ export default {
       handleRecordDetail(scope) {
         let that = this;
         that.fieldList = [];
-        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 = [];
+          if (res.code >= 200) {
-              let fieldList = res.data.record_data;
+            debugger;
-              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;
-              });
+            that.formName = res.data.form_.name;
-            })
+            that.fieldList = res.data.record_data;
           }
-        });
+        })
       },
     },
   };
 </script>
+<style scoped>
+  .items {
+    height: 35px;
+    line-height: 35px;
+    padding-left: 20px;
+  }
+
+  .itemLabel {
+    font-size: 14px;
+    color: #606266;
+    font-weight: 600;
+  }
+</style>

hb_client/src/views/qm/taskrecordfrom.vue

@@ -3,16 +3,15 @@
     <el-card style="margin-top: 2px">
       <el-descriptions title="任务详情" :column="5" border style="margin-bottom: 20px">
         <el-descriptions-item label="任务编号">{{productionplan.number}}</el-descriptions-item>
-  <el-descriptions-item label="产品名称" v-if="productionplan.product_">{{productionplan.product_.name}}</el-descriptions-item>
+        <el-descriptions-item label="产品名称" v-if="productionplan.product_">{{productionplan.product_.name}}
-  <el-descriptions-item label="规格型号" v-if="productionplan.product_">{{productionplan.product_.specification}}</el-descriptions-item>
+        </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="不合格品数量">{{productionplan.count_notok}}</el-descriptions-item>
         <el-descriptions-item label="玻璃编号">{{wproductnumber}}</el-descriptions-item>
         <el-descriptions-item label="玻璃所在子工序">{{process}}</el-descriptions-item>
-    
-   
       </el-descriptions>
-
       <el-table
         :data="recordList.results"
         border
@@ -26,9 +25,9 @@
           <template slot-scope="scope">{{ scope.row.form_.name }}</template>
         </el-table-column>
         <el-table-column label="检查类型">
-          <template slot-scope="scope">{{
+          <template slot-scope="scope">
-            checkTypes[scope.row.type]
+            {{checkTypes[scope.row.type]}}
-          }}</template>
+          </template>
         </el-table-column>
         <el-table-column label="是否提交">
           <template slot-scope="scope">
@@ -42,41 +41,37 @@
           </template>
         </el-table-column>
       </el-table>
-
       <!--非检查表显示-->
       <el-dialog
-        width="60%"
         :title="formName"
         :visible.sync="recordVisible"
         :close-on-click-modal="false"
         @close="recordCancel"
       >
-        <customForm
+        <el-row>
-          v-if="recordVisible"
+          <el-col v-for="item in fieldList" :key="item.id" :span="12">
-          :results="fieldList"
+            <div class="items" v-if="item.field_type!=='draw'">
-          :hasPicture="hasPicture"
+              <span class="itemLabel">{{item.field_name}}：</span>
-          :formID="recordform"
+              <span>{{item.field_value}}</span>
-          :wproduct="wproduct"
+            </div>
-          :recordId="recordId"
+          </el-col>
-          :isDisabled="isDisabled"
+          <el-col v-for="item in fieldList" :key="item.id" :span="24">
-          @recordSubmit="recordSubmit"
+            <div class="items" v-if="item.field_type==='draw'" style="height: 400px">
-          @recordSave="recordSave"
+              <span class="itemLabel">{{item.field_name}}：</span>
-          @recordCancel="recordCancel"
+              <img style="width: 45%;vertical-align: text-top;" :src="'http://47.95.0.242:2222'+item.field_value"/>
-        />
+            </div>
+          </el-col>
+        </el-row>
       </el-dialog>
     </el-card>
   </div>
 </template>
 <script>
   import checkPermission from "@/utils/permission";
-import { getProductionplan,getsubproductionplanList } from "@/api/pm";
+  import {getProductionplan} from "@/api/pm";
-import { getMaterialList, getrecordformList, getrffieldList } from "@/api/mtm";
-import customForm from "@/components/customForm/index";
   import {getTestRecord, getTestRecordItem} from "@/api/qm";
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
 
   export default {
-  components: { Pagination, customForm },
     data() {
       return {
         recordList: "",
@@ -93,7 +88,8 @@ export default {
           30: '已接受',
           40: '生产中',
           50: '已完成',
-         60:'军检完成'},
+          60: '军检完成'
+        },
         recordVisible: false,
         customfieldList: [],
         recordform: null,
@@ -144,47 +140,29 @@ export default {
       //点击记录里的查看
       handleRecordDetail(scope) {
         let that = this;
-      that.recordVisible = false;
+        that.fieldList = [];
-      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 = [];
+          if (res.code >= 200) {
-              let fieldList = res.data.record_data;
+            debugger;
-              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;
-              });
+            that.formName = res.data.form_.name;
-            });
+            that.fieldList = res.data.record_data;
           }
-        }
+        })
-      );
       },
     },
   };
 </script>
+<style scoped>
+  .items {
+    height: 35px;
+    line-height: 35px;
+    padding-left: 20px;
+  }
+
+  .itemLabel {
+    font-size: 14px;
+    color: #606266;
+    font-weight: 600;
+  }
+</style>

hb_client/src/views/wpm/need.vue

@@ -938,12 +938,11 @@
       //批量入库
       putins() {
         let _this = this;
-        _this.mutipID = []
+        _this.mutipID = [];
         this.$refs.multipleTable.selection.forEach((item) => {
           _this.mutipID.push(item.id);
 
         });
-        console.log(_this.mutipID);
         createputins({
           warehouse: this.form.warehouse,
           wproducts: _this.mutipID,
@@ -1185,6 +1184,7 @@
                   that.formName = res.data.form_.name;
                   let fieldList = res.data.record_data;
                   that.fieldList = [...fieldList];
+                  debugger;
                   let arr = fieldList.filter(item => {
                     return item.field_type === 'draw'
                   });

hb_server/apps/hrm/models.py

@@ -3,7 +3,7 @@ from django.contrib.auth.models import AbstractUser
 from django.db.models.base import Model
 import django.utils.timezone as timezone
 from django.db.models.query import QuerySet
-from apps.system.models import CommonAModel, CommonBModel, Organization, User, Dict, File,Position
+from apps.system.models import CommonADModel, CommonAModel, CommonBModel, Organization, User, Dict, File,Position
 from utils.model import SoftModel, BaseModel
 from simple_history.models import HistoricalRecords
 
@@ -36,3 +36,8 @@ class Employee(CommonAModel):
     def __str__(self):
         return self.name
 
+class Attendance(CommonADModel):
+    """
+    出勤记录
+    """
+    

hb_server/apps/inm/serializers.py

@@ -4,7 +4,7 @@ from rest_framework import serializers
 from apps.inm.models import FIFO, FIFOItem, FIFOItemProduct, IProduct, MaterialBatch, WareHouse, Inventory
 from apps.qm.models import TestRecord, TestRecordItem
 
-from apps.system.serializers import UserSimpleSerializer
+from apps.system.serializers import FileSimpleSerializer, UserSimpleSerializer
 from apps.mtm.serializers import MaterialSimpleSerializer
 from django.db import transaction
 
@@ -71,7 +71,7 @@ class FIFOListSerializer(serializers.ModelSerializer):
 class FIFOItemSerializer(serializers.ModelSerializer):
     warehouse_ = WareHouseSimpleSerializer(source='warehouse', read_only=True)
     material_ = MaterialSimpleSerializer(source='material', read_only=True)
-
+    files_ = FileSimpleSerializer(source='files', many=True, read_only=True)
     class Meta:
         model = FIFOItem
         fields = '__all__'

hb_server/apps/inm/tests.py

@@ -1,3 +1,10 @@
+from django.urls import reverse
 from django.test import TestCase
-
+from rest_framework.test import APITestCase
+from rest_framework import status
 # Create your tests here.
+class WareHouseTests(APITestCase):
+    def test_list_warehouse(self):
+        url = reverse('warehouse-list')
+        resp = self.client.get(url)
+        self.assertEqual(resp.status_code, status.HTTP_200_OK)

hb_server/apps/inm/views.py

@@ -82,7 +82,7 @@ class FIFOItemViewSet(ListModelMixin, DestroyModelMixin, UpdateModelMixin, Gener
     出入库记录详情表
     """
     perms_map = {'*': '*'}
-    queryset = FIFOItem.objects.select_related('material', 'fifo').all()
+    queryset = FIFOItem.objects.select_related('material', 'fifo').prefetch_related('files').all()
     serializer_class = FIFOItemSerializer
     filterset_fields = ['material', 'fifo',
                         'fifo__type', 'need_test', 'is_testok']

hb_server/apps/qm/serializers.py

@@ -59,6 +59,7 @@ class TestRecordItemSerializer(serializers.ModelSerializer):
     parent = serializers.PrimaryKeyRelatedField(source='form_field.parent', read_only=True)
     help_text = serializers.CharField(source='form_field.help_text', read_only=True)
     sort = serializers.IntegerField(source='form_field.sort', read_only=True)
+    draw_template = serializers.CharField(source='form_field.draw_template', read_only=True)
     class Meta:
         model = TestRecordItem
         fields = '__all__'

hb_server/server/settings.py

@@ -173,6 +173,7 @@ REST_FRAMEWORK = {
     'DEFAULT_SCHEMA_CLASS': 'rest_framework.schemas.coreapi.AutoSchema',
     'UNAUTHENTICATED_USER': None,
     'UNAUTHENTICATED_TOKEN': None,
+    'TEST_REQUEST_DEFAULT_FORMAT': 'json'
 }
 # simplejwt配置
 SIMPLE_JWT = {