Merge branch 'master' of https://e.coding.net/ctcdevteam/cnas

client/src/views/certapp/certapphandle.vue

@@ -14,6 +14,7 @@
     </el-card>
     <el-row :gutter="6" style="margin-top:6px">
       <el-col :xs="24" :md="20">
+
             <el-tabs type="border-card" v-model="activeName">
       <el-tab-pane label="申请信息" name="Basic" style="overflow-y:auto;overflow-x:hidden;">
         <CCCform @handleCommit="save" :certapp="certappdata" v-if="kind=='CCC'&isLoad"></CCCform>
@@ -27,24 +28,28 @@
       <el-tab-pane label="检测设备" name="Certunit2" v-if="certapp" lazy>
         
       </el-tab-pane>
-      <el-tab-pane label="资料评审" name="Certunit3" v-if="certapp" lazy>
+    
-        <REVIEW :certapp="certapp"></REVIEW>
+          <el-tab-pane label="资料评审" name="Productunit3" v-if="certapp" lazy>
-      </el-tab-pane>
+            <REVIEW :certapp="certapp"></REVIEW>
-      <el-tab-pane label="收费信息" name="Certunit4" v-if="certapp" lazy>
+          </el-tab-pane>
+          <el-tab-pane label="收费信息" name="Productunit4" v-if="certapp" lazy>
 
-          <CHARGE :certapp="certapp"></CHARGE>
+            <CHARGE :certapp="certapp"></CHARGE>
-      
+
-      </el-tab-pane>
+          </el-tab-pane>
-      <el-tab-pane label="审核成员" name="Certappmember" v-if="certapp" lazy>
+          <el-tab-pane label="审核成员" name="Certappmember" v-if="certapp" lazy>
-        <Member :certapp="certapp" ></Member>
+            <Member :certapp="certapp"></Member>
-      </el-tab-pane>
+          </el-tab-pane>
-      <el-tab-pane label="现场审核反馈" name="Certappfeedback" v-if="certapp" lazy>
+          <el-tab-pane label="现场审核反馈" name="Certappfeedback" v-if="certapp" lazy>
-        <Conclusion :certapp="certapp" ></Conclusion>
+            <Conclusion :certapp="certapp"></Conclusion>
-      </el-tab-pane>
+          </el-tab-pane>
-      <el-tab-pane label="认证评定" name="Certappaccess" v-if="certapp" lazy>
+          <el-tab-pane label="认证评定" name="Certappaccess" v-if="certapp" lazy>
-        <access :certapp="certapp" ></access>
+            <access :certapp="certapp"></access>
-      </el-tab-pane>
+          </el-tab-pane>
-    </el-tabs>
+          <el-tab-pane label="安排检测任务" name="Certapptask" v-if="certapp" lazy>
+            <Detectiontask :certapp="certapp"></Detectiontask>
+          </el-tab-pane>
+        </el-tabs>
       </el-col>
       <el-col :xs="24" :md="4">
             <el-card>
@@ -76,9 +81,12 @@ import QMSform from "@/views/certapp/qmsform"
 import Conclusion from "@/views/audit/conclusion"
 import Member from "@/views/audit/member"
 import access from "@/views/accessment/access"
-import REVIEW from "@/views/certapp/review"
+  import REVIEW from "@/views/certapp/review"
+  import Detectiontask from "@/views/certapp/detectiontask"
 export default {
-  components: { CCCform, Certunit, QMSform, Conclusion, Member, access, CHARGE, REVIEW},
+
+  components: { CCCform, Certunit, QMSform,Productunit, Conclusion, Member, access, CHARGE, REVIEW},
+
   props: [],
   data() {
     return {

client/src/views/certapp/detectiontask.vue

@@ -0,0 +1,320 @@
+<template>
+  <div>
+    <el-table
+      v-loading="listLoading"
+      :data="tableData.results"
+      style="width: 100%;"
+      border
+      fit
+      stripe
+      highlight-current-row
+      height="380"
+      @row-click="rowClick"
+    >
+      <el-table-column type="index" width="50" />
+      <el-table-column label="单元名称">
+        <template slot-scope="scope" >{{ scope.row.name }}</template>
+      </el-table-column>
+      <el-table-column label="单元描述">
+        <template slot-scope="scope" >{{ scope.row.description }}</template>
+      </el-table-column>
+      <el-table-column label="采用标准">
+        <template slot-scope="scope" >{{ scope.row.standard_.fullname }}</template>
+      </el-table-column>
+      <el-table-column label="创建时间">
+        <template slot-scope="scope">
+          <span>{{ scope.row.create_time }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作">
+        <template slot-scope="scope">
+          <el-button
+            type="danger"
+            size="small"
+            :disabled="!checkPermission(['certapps_update'])"
+            @click="handleDelete(scope)"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="tableData.count>0"
+      :total="tableData.count"
+      :page.sync="listQuery.page"
+      :limit.sync="listQuery.page_size"
+      @pagination="getList"
+    />
+    <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="80px" style="margin-top:10px">
+      <el-col :xs="24" :md="12">
+        <el-form-item label="实施规则" prop="implementrule">
+          <el-select
+            v-model="formData.implementrule"
+            placeholder="请选择实施规则"
+            clearable
+            :style="{width: '100%'}"
+            @change="changeTypeOptions"
+          >
+            <el-option
+              v-for="(item, index) in implementruleOptions"
+              :key="index"
+              :label="item.fullname"
+              :value="item.id"
+              :disabled="item.disabled"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :xs="24" :md="12">
+        <el-form-item label="单元类型" prop="unittype">
+          <el-select
+            v-model="formData.unittype"
+            placeholder="请选择单元类型"
+            clearable
+            :style="{width: '100%'}"
+            @change="changeUnit"
+          >
+            <el-option
+              v-for="(item, index) in unittypeOptions"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+              :disabled="item.disabled"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :xs="24" :md="12">
+        <el-form-item label="采用标准" prop="standard">
+          <el-input
+            v-model="formData.standard_.fullname"
+            placeholder="请输入采用标准"
+            readonly
+            clearable
+            :style="{width: '100%'}"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :xs="24" :md="12">
+        <el-form-item label="检测机构" prop="testorg">
+          <el-select v-model="formData.testorg" placeholder="请选择检测机构" clearable :style="{width: '100%'}">
+            <el-option
+              v-for="(item, index) in testorgOptions"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+              :disabled="item.disabled"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :xs="24" :md="8">
+        <el-form-item label="单元名称" prop="name">
+          <el-input
+            v-model="formData.name"
+            placeholder="请输入单元名称"
+            clearable
+            :style="{width: '100%'}"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :xs="24" :md="16">
+        <el-form-item label="单元描述" prop="description">
+          <el-input
+            v-model="formData.description"
+            placeholder="请输入单元描述"
+            clearable
+            :style="{width: '100%'}"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
+        <el-form-item size="large">
+          <el-button type="primary" @click="createNew">创建新记录</el-button>
+          <el-button type="primary" @click="updateNow">保存</el-button>
+          <el-button @click="resetForm">重置</el-button>
+        </el-form-item>
+      </el-col>
+    </el-form>
+  </div>
+</template>
+<script>
+import { getImplementRuleList, getUnitTypeList } from "@/api/implementrule"
+import { getUnitList, deleteUnit, createUnit, updateUnit } from "@/api/unit";
+import { getDictList } from "@/api/dict";
+import Pagination from "@/components/Pagination";
+import checkPermission from "@/utils/permission";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { genTree } from "../../utils";
+export default {
+  name: "Productunit",
+  components: { Pagination, Treeselect },
+  props:['certapp'],
+  data() {
+    return {
+      tableData: { count: 0 },
+      listLoading: true,
+      listQuery: {
+        page: 1,
+        page_size: 20,
+        certapp:this.certapp
+      },
+      formData: {
+        certapp:this.certapp,
+        implementrule: undefined,
+        unittype: undefined,
+        standard: undefined,
+        standard_:{},
+        testorg: undefined,
+        name: undefined,
+        description: undefined,
+      },
+      rules: {
+        implementrule: [
+          {
+            required: true,
+            message: "请选择实施规则",
+            trigger: "change",
+          },
+        ],
+        unittype: [
+          {
+            required: true,
+            message: "请选择单元类型",
+            trigger: "change",
+          },
+        ],
+        standard: [],
+        testorg: [],
+        name: [
+          {
+            required: true,
+            message: "请输入单元名称",
+            trigger: "blur",
+          },
+        ],
+        description: [
+          {
+            required: true,
+            message: "请输入单元描述",
+            trigger: "blur",
+          },
+        ],
+      },
+      implementruleOptions: [
+      ],
+      unittypeOptions: [
+      ],
+      testorgOptions: [
+      ],
+    };
+  },
+  watch:{
+    'formData.implementrule': function(val){
+      this.changeTypeOptions()
+    },
+  },
+  created() {
+    this.getList();
+    this.getImplementRuleOptions()
+  },
+  methods: {
+    checkPermission,
+    getList() {
+      this.listLoading = true;
+      getUnitList(this.listQuery).then((response) => {
+
+        if (response.data) {
+          
+          this.tableData = response.data;
+          
+        }
+        this.listLoading = false;
+      });
+    },
+    resetFilter() {
+      this.listQuery = {
+        page: 1,
+        page_size: 20,
+      };
+      this.getList();
+    },
+    handleFilter() {
+      this.listQuery.page = 1;
+      this.getList();
+    },
+    handleCreate(item, index) {
+      this.$router.push({
+        name: "CertappForm",
+        params: { kind: item.code, action: "create" },
+      });
+    },
+    handleUpdate(scope) {
+      this.$router.push({
+        name: "CertappForm",
+        params: { action: "update", kind: scope.row.cert_field_.code },
+        query: { id: scope.row.id },
+      });
+    },
+    handleDelete(scope) {
+      this.$confirm("确定删除?", "警告", {
+        // confirmButtonText: '确定',
+        // cancelButtonText: '取消',
+        type: "warning",
+      }).then(() => {
+        deleteUnit(scope.row.id).then((res) => {
+          this.$message.success("成功");
+          this.getList();
+        });
+      }).catch(()=>{});
+    },
+    createNew() {
+      this.$refs['elForm'].validate(valid => {
+        if (!valid) return
+        // TODO 提交表单
+        createUnit(this.formData).then(res=>{
+          this.getList()
+          this.$message.success('成功')
+        })
+      })
+    },
+    updateNow(){
+      this.$refs['elForm'].validate(valid => {
+        if (!valid) return
+        // TODO 提交表单
+        updateUnit(this.formData.id, this.formData).then(res=>{
+          this.getList()
+          this.$message.success('成功')
+        })
+      })
+    },
+    resetForm() {
+      this.$refs['elForm'].resetFields()
+    },
+    getImplementRuleOptions(){
+      var query = {ccc_list:this.certapp.cccpv_class}
+      getImplementRuleList(query).then(res=>{
+        this.implementruleOptions = res.data.results
+      })
+    },
+    changeTypeOptions(){
+      getUnitTypeList({implementrule:this.formData.implementrule}).then(res=>{
+        this.unittypeOptions = genTree(res.data)
+      })
+    },
+    changeUnit(val){
+      let obj = {};
+      obj = this.unittypeOptions.find((item)=>{//这里的userList就是上面遍历的数据源
+          return item.id === val;//筛选出匹配数据
+      });
+      this.formData.name = obj.name
+      this.formData.standard = obj.standard
+      this.formData.standard_ = obj.standard_
+    },
+    rowClick(row, column, event){
+      this.formData = Object.assign({}, row);
+    }
+  },
+};
+</script>

client/src/views/certapp/qmsform.vue

@@ -298,7 +298,7 @@ export default {
   name: "QMSform",
   inheritAttrs: false,
   components: { Enterprisechose, Treeselect },
-  props: ["action", "certapp"],
+   props: ["certapp"],
   data() {
       return {
         activeNames: ['1', '2', '3', '4','5'],

client/src/views/certapp/review.vue

@@ -4,32 +4,36 @@
       <el-row :gutter="12">
      
         <el-col>
-            <el-table id="evl"
+          <el-table id="evl"
-                      ref="multipleTable"
+                    ref="multipleTable"
-                      :data="eltList"
+                    :data="eltList"
-                      style="width: 100%;margin-top:10px;"
+                    style="width: 100%;margin-top:10px;"
-                      border
+                    border
-                      fit
+                    fit
-                      highlight-current-row
+                    highlight-current-row
-                      max-height="600">
+                    max-height="600">
-              <el-table-column align="center" label="项目内容" width="750">
+            <el-table-column align="center" label="项目内容" width="750">
-                <template slot-scope="scope">
+              <template slot-scope="scope">
-                  <span v-if="scope.row.item">{{ scope.row.item.content }}</span>
+                <span v-if="scope.row.item">{{ scope.row.item_v }}</span>
-                  <span v-else>{{ scope.row.content }}</span>
+                <span v-else>{{ scope.row.content }}</span>
-                </template>
+              </template>
-              </el-table-column>
+            </el-table-column>
 
-              <el-table-column label="符合">
+            <el-table-column label="符合">
-                <template slot-scope="scope">
+              <template slot-scope="scope">
-                  <!-- @change="changeHandler(scope.$index,radio[scope.$index])" -->
+                <!-- @change="changeHandler(scope.$index,radio[scope.$index])" -->
-                  <el-radio-group v-model="radio[scope.$index]" @change="changeHandler(scope.$index,radio[scope.$index])">
+                <el-radio-group v-model="radio[scope.$index]" @change="changeHandler(scope.$index,radio[scope.$index])">
-    <el-radio :label="item" :key="item" v-for="item in review_options ">{{item}}</el-radio>
+                  <el-radio :label="item" :key="item" v-for="item in review_options ">{{item}}</el-radio>
-  </el-radio-group>
+                </el-radio-group>
-                </template>
+              </template>
 
-              </el-table-column>
+            </el-table-column>
-
+            <!--<el-table-column label="需说明备注">
-            </el-table>
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.remark"></el-input>
+              </template>
+            </el-table-column>-->
+          </el-table>
         </el-col>
 
       </el-row>
@@ -81,43 +85,73 @@ export default {
 
   },
     created() {
-    
+     
-   this.getList()
+      
+  this.gitEvadellist()
   },
   mounted() {},
     methods: {
+      //创建的时候的加载
       getList() {
-      
       getEvaluationsList().then(response => {
        
         this.eltList = response.data.results
-        for (var i = 0; i < this.eltList.length; i++) {
+       
-          // this.eltList[i].options = this.review_options;
-          // this.eltList[i].result = '符合'
-        }
         
       });
       },
-      // 获取表格选中时的数据
+      //修改的时候加载
-      selectRow (val) {
+      gitEvadellist() {
-        this.selectlistRow = val
+        getEvaluationDetailList({cert_app:this.certapp}).then(response => {
+          if (response.data.results.length) {
+            this.eltList = response.data.results;
+
+            let myarrq = response.data.results;
+            let arrq = [];
+            for (var i = 0; i < myarrq.length; i++) {
+              arrq.push(myarrq[i].result)
+
+            }
+            this.radio = arrq;
+          }
+          else {
+             this.getList()
+          }
+        
+        
+      });
+
       },
+     //选中赋值
       changeHandler(val1, val2) {
         console.log(val1,val2)
         this.eltList[val1].result = val2
-        console.log(this.eltList)
+     
-    },
+      },
+      //保存
       handelConfirm() {
-        console.log(this.eltList)
+        console.log(this.eltList[0].evItem)
-        let rlist = []
+        if (this.eltList[0].evItem) {
-        for (var i = 0; i < this.eltList.length; i++) {
+          let rlist = []
-          rlist.push({id:this.eltList[i].id,result:this.eltList[i].result}) 
+          for (var i = 0; i < this.eltList.length; i++) {
+            rlist.push({ id: this.eltList[i].id, content: this.eltList[i].content, result: this.eltList[i].result })
+          }
+          reviewCertapp({ certapps: [this.certapp], rlist: rlist }).then(res => {
+            this.$message.success('创建成功')
+          })
+
         }
-        reviewCertapp({certapps:[this.certapp], rlist:rlist}).then(res=>{
+        else {
-          this.$message.success('成功')
+          let rlist = []
-        })
+          for (var i = 0; i < this.eltList.length; i++) {
-  // let val = this.selectlistRow
+            rlist.push({ id: this.eltList[i].id, content: this.eltList[i].content, result: this.eltList[i].result })
-  // console.log(this.selectlistRow);
+          }
+          reviewCertapp({ certapps: [this.certapp], rlist: rlist }).then(res => {
+            this.$message.success('修改成功')
+          })
+
+        }
+        
     },
     
     

server/apps/laboratory/models.py

@@ -37,4 +37,9 @@ class TestOrgNotice(CommonBModel):
 
     def __str__(self):
         return self.name
+class DetectionTask(CommonBModel):
 
+    testorg = models.ForeignKey(TestOrg,verbose_name='检测机构', related_name='detectionTask_testorg', on_delete=models.DO_NOTHING)
+
+
+    

server/apps/project/migrations/0033_merge_20200916_1011.py

@@ -0,0 +1,14 @@
+# Generated by Django 3.0.5 on 2020-09-16 02:11
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('project', '0032_merge_20200903_1142'),
+        ('project', '0029_auto_20200904_1553'),
+    ]
+
+    operations = [
+    ]

server/apps/project/migrations/0034_evaluationdetail_result.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.5 on 2020-09-16 02:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('project', '0033_merge_20200916_1011'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='evaluationdetail',
+            name='result',
+            field=models.TextField(blank=True, null=True, verbose_name='符合结果'),
+        ),
+    ]

server/apps/project/models.py

@@ -187,15 +187,11 @@ class SubApplication(CommonBModel):
         return self.number
 
 class EvaluationDetail(CommonBModel):
-    result_choices = (
+   
-        ('符合', '符合'),
-        ('不符合', '不符合'),
-        ('不适用', '不适用'),
-        ('需说明', '需说明'),
-    )
     cert_app = models.ManyToManyField(CertApp,  verbose_name='关联受理',  related_name='evaluationdetail_cert_app')
     item = models.ForeignKey(Evaluations,on_delete=models.DO_NOTHING,verbose_name='评审项',null=True, blank=True, related_name='evaluationdetail_item')
     item_v = JSONField(verbose_name='评审项目',null=True, blank=True)
+    result = models.TextField('符合结果',null=True, blank=True)
     remark = models.TextField('备注', null=True, blank=True)
 
     class Meta:

server/apps/project/views.py

@@ -112,7 +112,7 @@ class CertappViewset(PageOrNot, RbacFilterSet, ModelViewSet):
         certapps = request.data['certapps']
         rlist = request.data['rlist']
         for i in rlist:
-            instance = EvaluationDetail.objects.create(item=Evaluations.objects.get(id=i['id']), create_by=request.user, result=i['result'] if 'result' in i and i['result'] else None)
+            instance = EvaluationDetail.objects.create(item=Evaluations.objects.get(id=i['id']),item_v=i['content'], create_by=request.user, result=i['result'] if 'result' in i and i['result'] else None)
             instance.cert_app.add(*certapps)
         return Response(status=status.HTTP_200_OK)
 
@@ -143,6 +143,16 @@ class EvaluationDetailViewset(CreateUpdateCustomMixin, PageOrNot,ModelViewSet):
     serializer_class = EvaluationDetailSerializer
     filterset_fields = ['cert_app']
     ordering = ['-create_time']
+    def reviewupdate(self, request, pk=None):
+        """
+        完成评审
+        """
+     
+        rlist = request.data['rlist']
+        for i in rlist:
+            instance = EvaluationDetail.objects.update(item=Evaluations.objects.get(id=i['id']),item_v=i['content'], update_by=request.user, result=i['result'] )
+            
+        return Response(status=status.HTTP_200_OK)
     
 
 from rest_framework.mixins import ListModelMixin