Merge branch 'bjxz-cjw' into bjxz-dev

src/assets/i18n/langs/cn/companyAdmin/extendInfo.js

@@ -1,3 +1,4 @@
+const newLocal = '总投资额(万元)';
 export default {
     projectExtension:'项目扩展信息表',
     contractSigning:'合同签订',
@@ -48,5 +49,6 @@ export default {
         ],
       },
       modifySuccessfully:"修改成功",
-      contractPrice:'合同额(万元)'
+      contractPrice:'施工合同额(万元)',
+      investmentPrice:'总投资额(万元)'
 }

src/assets/i18n/langs/en/cooperationUnit.js

@@ -31,4 +31,5 @@ subpackage9:'总承包单位',
 subpackage10:'勘查单位',
 subpackage11:'设计单位',
 subpackage12:'其它',
+subpackage13:'全部类型',
 }

src/views/jxjadmin/registerAudit.vue

@@ -220,7 +220,7 @@
         </div>
       </div>
     </el-dialog>
-    <!-- 新增企业弹框 -->
+    <!--                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            弹框 -->
     <el-dialog :modal-append-to-body="false" @close="close" :title="titleRes" :visible.sync="diaLogShow" width="667px">
       <div class="dialog_content">
         <el-form size="medium" ref="addEditForm" :model="addEditForm" :rules="addEditRules" label-width="120px" class="dialogFormBox">

src/views/projectFront/carManage/carManage.vue

@@ -783,6 +783,7 @@
             <el-select
               v-model="addEditForm.alarmPushWorkerId"
               multiple
+              filterable
               collapse-tags
               :placeholder="$t('message.deviceManage.placeholder_select')"
             >

src/views/projectFront/dangerousBigProject/addPlan.vue

@@ -95,7 +95,7 @@
                                 :props="props"
                                 clearable>
                             </el-cascader> -->
-                            <el-select v-model="addForm.responsibilityCompanyId" placeholder="请选择责任分包单位" @change="unitChange">
+                            <el-select v-model="addForm.responsibilityCompanyId" filterable placeholder="请选择责任分包单位" @change="unitChange">
                                 <el-option 
                                     :label="item.enterpriseName"
                                     :value="item.id"
@@ -107,7 +107,7 @@
                         </el-form-item>
                         <el-form-item label="责任人：" required :label-width="formLabelWidth">
                             <!-- <el-input v-model="addForm.personLiable" :disabled="isDisabled" placeholder="请输入责任人" autocomplete="off"></el-input> -->
-                            <el-select v-model="addForm.personLiableId" placeholder="请选择责任人">
+                            <el-select v-model="addForm.personLiableId" filterable placeholder="请选择责任人">
                                 <el-option
                                     :label="item.realName"
                                     :value="item.userId"

src/views/projectFront/devicePosition/deviceCentral/deviceCentral.vue

@@ -57,7 +57,7 @@
             <el-input v-model="addEditForm.devSn" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="司机" prop="driverId">
-            <el-select v-model="addEditForm.driverId" placeholder="请选择" clearable :style="{ width: '100%' }">
+            <el-select v-model="addEditForm.driverId" filterable placeholder="请选择" clearable :style="{ width: '100%' }">
               <el-option v-for="(item, index) in workerList" :key="index" :label="item.workerName" :value="item.id"></el-option>
             </el-select>
           </el-form-item>

src/views/projectFront/emergencyDisposal/emergencyDisposal.vue

@@ -4,7 +4,7 @@
             <div class="search-box">
                 <el-form :inline="true" :model="formInline" class="demo-form-inline" size="small">
                     <el-form-item label="企业">
-                        <el-select v-model="formInline.enterpriseId" placeholder="请选择企业">
+                        <el-select v-model="formInline.enterpriseId" filterable placeholder="请选择企业">
                             <el-option :label="item.enterpriseName" :value="item.id"
                                 v-for="(item, index) in responsibilityList" :key="index">
                             </el-option>

src/views/projectFront/emergencyDisposal/emergencyPush.vue

@@ -4,7 +4,7 @@
             <div class="search-box">
                 <el-form :inline="true" :model="formInline" class="demo-form-inline" size="small">
                     <el-form-item label="企业">
-                        <el-select v-model="formInline.enterpriseId" placeholder="请选择企业">
+                        <el-select v-model="formInline.enterpriseId" filterable placeholder="请选择企业">
                             <el-option :label="item.enterpriseName" :value="item.id"
                                 v-for="(item, index) in responsibilityList" :key="index">
                             </el-option>

src/views/projectFront/emergencyDisposal/reliefApprove.vue

@@ -4,7 +4,7 @@
             <div class="search-box">
                 <el-form :inline="true" :model="formInline" class="demo-form-inline" size="small">
                     <el-form-item label="企业">
-                        <el-select v-model="formInline.enterpriseId" placeholder="请选择企业">
+                        <el-select v-model="formInline.enterpriseId" filterable placeholder="请选择企业">
                             <el-option :label="item.enterpriseName" :value="item.id"
                                 v-for="(item, index) in responsibilityList" :key="index">
                             </el-option>

src/views/projectFront/examSystem2/examManagement/examManagement.vue

@@ -83,7 +83,7 @@
                     <div @click="openDoor">
                       <el-radio :label="1">手动抽题</el-radio>
                     </div>
-                    <div style="margin-left:10px" @click="dialogVisible3 = true">
+                    <div style="margin-left:10px" @click="openRandom">
                       <el-radio :label="2">随机抽题</el-radio>
                     </div>
                   </div>
@@ -595,6 +595,15 @@ export default {
     // this.loadData() // 查询班组及部门
   },
   methods: {
+    openRandom(){
+      this.dialogVisible3 = true
+      this.getList({
+        pageNo: 1,
+        pageSize: 99999,
+        questionName: "",
+        questionSubjectId: this.randomQuestion.name,
+      })
+    },
     cancel2(){
       // this.examForm.checkQuestionType = null
       this.dialogVisible2 = false
@@ -856,13 +865,13 @@ export default {
               this.$message.success('新增成功')
               this.handleClose()
               this.getRecordList()
+              this.clearFilter()
             })
           } else {
             // this.examForm.questions = this.$refs.questionListTable.selection;
             if(this.$refs.questionListTable){
               this.examForm.questions = this.$refs.questionListTable.selection;
             } else {
-              // if(this.examForm.checkQuestionType === 1){
               let arr = [];
               this.questionList.map(item => {
                 this.examForm.questions.split(',').map(item2 => {
@@ -873,21 +882,13 @@ export default {
                 })
               })
               this.examForm.questions = arr;
-              // }else{
-                console.log("==========================")
-                console.log(this.examForm)
-                console.log("==========================")
-              // }
             }
             console.log("123123131231231313123123")
             console.log(this.examForm)
             console.log("123123131231231313123123")
-            if(this.examForm.checkQuestionType === 2){
+            if(this.examForm.checkQuestionType === 2 && this.randomQuestionList.length === 0){
               this.randomQuestionList = this.examForm.questions
             }
-            console.log(this.randomQuestionList)
-            console.log("123123131231231313123123")
-            console.log(this.randomQuestionList.map(item => item.id).join(','))
 
             let examInfo = {
               checkQuestionType:this.examForm.checkQuestionType,
@@ -903,8 +904,10 @@ export default {
                   id:item.id,
                 }
               }),
-              radio:this.examForm.checkQuestionType == 1 ? this.examForm.questions.filter(item => item.type == 1).length : this.randomQuestion.examSingle.count,
+              // radio:this.examForm.checkQuestionType == 1 ? this.examForm.questions.filter(item => item.type == 1).length : this.randomQuestion.examSingle.count,
-              multi:this.examForm.checkQuestionType == 1 ? this.examForm.questions.filter(item => item.type == 2).length : this.randomQuestion.examMultiple.count,
+              // multi:this.examForm.checkQuestionType == 1 ? this.examForm.questions.filter(item => item.type == 2).length : this.randomQuestion.examMultiple.count,
+              radio:this.examForm.checkQuestionType == 1 ? this.examForm.questions.filter(item => item.type == 1).length : this.randomQuestionList.filter(item => item.type === 1).length,
+              multi:this.examForm.checkQuestionType == 1 ? this.examForm.questions.filter(item => item.type == 2).length : this.randomQuestionList.filter(item => item.type === 2).length
             }
             // examInfo.questions = this.examForm.checkQuestionType == 1 ? this.examForm.questions.map(item => item.id).join(',') : this.randomQuestionList.map(item => item.id).join(','),
             examInfo.id = this.examForm.id
@@ -913,6 +916,7 @@ export default {
                 this.$message.success('编辑成功')
                 this.handleClose()
                 this.getRecordList()
+                this.clearFilter()
               }
             })
           }

src/views/projectFront/examSystem2/trainRecord/trainPlan.vue

@@ -190,13 +190,13 @@
                             <el-form :inline="true" ref="searchRef" size="medium" class="demo-form-inline">
                                 <!-- <el-form-item label="选择企业" prop="enterpriseId"> -->
                                 <el-form-item label="" prop="enterpriseId">
-                                    <el-select v-model="workerInfo.enterpriseId" placeholder="请选择企业" @change="getTeamInfoList" clearable="">
+                                    <el-select v-model="workerInfo.enterpriseId" filterable placeholder="请选择企业" @change="getTeamInfoList" clearable="">
                                         <el-option v-for="item in enterpriseInfoList" :key="item.id" :label="item.enterpriseName" :value="item.id"></el-option>
                                     </el-select>
                                 </el-form-item>
                                 <!-- <el-form-item label="选择班组" prop="teamId"> -->
                                 <el-form-item label="" prop="departmentAndTeam">
-                                    <el-select v-model="workerInfo.departmentAndTeam" placeholder="请选择班组/部门" value-key="gtMaterialDepartmentTeamId" clearable>
+                                    <el-select v-model="workerInfo.departmentAndTeam" filterable placeholder="请选择班组/部门" value-key="gtMaterialDepartmentTeamId" clearable>
                                         <!-- <el-option v-for="item in teamInfoList" :key="item.id" :label="item.teamName" :value="item.id"></el-option> -->
                                         <el-option v-for="(item) in teamInfoList" :key="item.gtMaterialDepartmentTeamId" :label="item.departmentTeamName" :value="item"></el-option>
                                     </el-select>

src/views/projectFront/progressManagementAg/divisionSubManage.vue

@@ -503,7 +503,7 @@
               </el-date-picker>
             </el-form-item>
             <el-form-item label="负责人" prop="dutyUserName">
-              <el-select v-model="workerInfo.dutyUserId" placeholder="请选择">
+              <el-select v-model="workerInfo.dutyUserId" placeholder="请选择" filterable>
                 <el-option
                   v-for="item in principalLsit"
                   :key="item.userId"

src/views/projectFront/projectSummary/extendInfo.vue

@@ -17,12 +17,21 @@
           </div>
           <div class="flex4">
             <div class="type_content">
+              <!-- 施工合同额 -->
               <div class="flex3">
                 <span class="width_35">
                   {{ $t("message.extendInfo.contractPrice") }}
                 </span>
                 <span class="width_65">{{ projectDetail.contractPrice }}</span>
               </div>
+              <!-- 总投资额(万元) -->
+              <div class="flex3">
+                <span class="width_35">
+                  {{ $t("message.extendInfo.investmentPrice") }}
+                </span>
+                <span class="width_65">{{ projectDetail.contractPrice }}</span>
+              </div>
+              
               <div class="flex3">
                 <span class="width_35">
                   {{ $t("message.extendInfo.contractSigning") }}
@@ -92,6 +101,10 @@
                 <!-- <span class="width_35"></span> -->
                 <span class="width_65"></span>
               </div>
+              <div class="flex3">
+                <!-- <span class="width_35"></span> -->
+                <span class="width_65"></span>
+              </div>
               <div class="flex3">
                 <span
                   class="width_35 bg_color"
@@ -151,7 +164,7 @@
         <el-form
           ref="editProjectForm"
           :model="editProjectForm"
-          label-width="120px"
+          label-width="140px"
           :rules="editProjectFormRules"
           size="medium"
         >
@@ -532,7 +545,7 @@ export default {
     box-sizing: border-box;
     border: 1px solid rgba(148, 148, 148, 0.5);
     border-bottom: none;
-    margin-top: 30px;
+    margin-top: 23px;
     // color: #333;
     .title {
       width: 100%;

src/views/projectFront/quality/businessModule/checkPoint.vue

@@ -109,6 +109,7 @@
             <el-select
               v-model="form.dutyId"
               multiple
+              filterable
               @change="changeDutyId"
               :placeholder="$t('message.quality.pleaseSelect')"
               style="width: 100%"
@@ -128,7 +129,9 @@
           <el-form-item label="责任人" prop="personId">
             <el-select
               v-model="form.personId"
+              filterable
               multiple
+              reserve-keyword
               :placeholder="$t('message.quality.pleaseSelect')"
               style="width: 100%"
               prop="personId"

src/views/projectFront/safetyEducation/trainingRecords.vue

@@ -23,7 +23,7 @@
 
         <!-- 培训类型 -->
         <el-form-item :label="$t('message.safetyEducation.trainingType')">
-          <el-select
+          <el-select filterable
             v-model="formInline.eduType"
             :placeholder="$t('message.carManage.placeholder_select')"
           >

src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayAlarmRecord.vue

@@ -4,7 +4,7 @@
       <el-form :inline="true" ref="searchForm" :model="searchForm" size="medium">
         <!-- 人员名称 -->
         <el-form-item label="人员名称" prop="workerInfoId">
-          <el-select v-model="searchForm.devSn" placeholder="请选择" clearable :style="{ width: '100%' }" >
+          <el-select v-model="searchForm.devSn" placeholder="请选择" filterable clearable :style="{ width: '100%' }" >
             <!-- <el-option v-for="(item, index) in workerList" :key="index" :label="item.workerName" :value="item.id" ></el-option> -->
             <el-option v-for="(item, index) in devSnList" :key="index" :label="item.workerName" :value="item.devSn" ></el-option>
           </el-select>

src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayRealTimeData.vue

@@ -9,7 +9,7 @@
       >
         <!-- 人员名称 -->
         <el-form-item label="人员名称" prop="workerInfoId">
-          <el-select v-model="searchForm.devSn" placeholder="请选择" clearable :style="{ width: '100%' }" >
+          <el-select v-model="searchForm.devSn" placeholder="请选择" filterable clearable :style="{ width: '100%' }" >
             <!-- <el-option v-for="(item, index) in workerList" :key="index" :label="item.workerName" :value="item.id" ></el-option> -->
             <el-option v-for="(item, index) in devSnList" :key="index" :label="item.workerName" :value="item.devSn" ></el-option>
           </el-select>

src/views/projectFront/smartSafeHat/deviceCentral/deviceCentral.vue

@@ -65,7 +65,7 @@
         <el-form size="medium" ref="addEditForm" :model="addEditForm" :rules="addEditRules" label-width="120px" class="dialogFormBox">
           <el-form-item label="绑定人员" prop="workerInfoId">
             <!-- <el-input v-model="addEditForm.workerName" placeholder="请输入"></el-input> -->
-            <el-select v-model="addEditForm.workerInfoId" placeholder="请选择" clearable :style="{ width: '100%' }">
+            <el-select v-model="addEditForm.workerInfoId" filterable placeholder="请选择" clearable :style="{ width: '100%' }">
               <el-option v-for="(item, index) in workerList" :key="index" :label="item.workerName" :value="item.id"></el-option>
             </el-select>
           </el-form-item>

src/views/projectFront/specialWork/blindPlugWork.vue

@@ -8,7 +8,7 @@
                         </el-input>
                     </el-form-item>
                     <el-form-item label="作业申请单位">
-                        <el-select v-model="formInline.enterpriseId" placeholder="请选择">
+                        <el-select v-model="formInline.enterpriseId" filterable placeholder="请选择">
                             <el-option :label="item.enterpriseName" :value="item.id"
                                 v-for="(item, index) in responsibilityList" :key="index">
                             </el-option>

src/views/projectFront/specialWork/confinedSpaceWork.vue

@@ -8,7 +8,7 @@
                         </el-input>
                     </el-form-item>
                     <el-form-item label="作业申请单位">
-                        <el-select v-model="formInline.enterpriseId" placeholder="请选择">
+                        <el-select v-model="formInline.enterpriseId" filterable placeholder="请选择">
                             <el-option :label="item.enterpriseName" :value="item.id"
                                 v-for="(item, index) in responsibilityList" :key="index">
                             </el-option>

src/views/projectFront/specialWork/disconnectionWork.vue

@@ -8,7 +8,7 @@
                         </el-input>
                     </el-form-item>
                     <el-form-item label="作业申请单位">
-                        <el-select v-model="formInline.enterpriseId" placeholder="请选择">
+                        <el-select v-model="formInline.enterpriseId" filterable placeholder="请选择">
                             <el-option :label="item.enterpriseName" :value="item.id"
                                 v-for="(item, index) in responsibilityList" :key="index">
                             </el-option>

src/views/projectFront/specialWork/fireWork.vue

@@ -8,7 +8,7 @@
                         </el-input>
                     </el-form-item>
                     <el-form-item label="作业申请单位">
-                        <el-select v-model="formInline.enterpriseId" placeholder="请选择">
+                        <el-select v-model="formInline.enterpriseId" filterable placeholder="请选择">
                             <el-option :label="item.enterpriseName" :value="item.id"
                                 v-for="(item, index) in responsibilityList" :key="index">
                             </el-option>

src/views/projectFront/specialWork/riggingOutWork.vue

@@ -8,7 +8,7 @@
                         </el-input>
                     </el-form-item>
                     <el-form-item label="作业申请单位">
-                        <el-select v-model="formInline.enterpriseId" placeholder="请选择">
+                        <el-select v-model="formInline.enterpriseId" filterable placeholder="请选择">
                             <el-option :label="item.enterpriseName" :value="item.id"
                                 v-for="(item, index) in responsibilityList" :key="index">
                             </el-option>

src/views/projectFront/specialWork/startBuildingWork.vue

@@ -8,7 +8,7 @@
                         </el-input>
                     </el-form-item>
                     <el-form-item label="作业申请单位">
-                        <el-select v-model="formInline.enterpriseId" placeholder="请选择">
+                        <el-select v-model="formInline.enterpriseId" filterable placeholder="请选择">
                             <el-option :label="item.enterpriseName" :value="item.id"
                                 v-for="(item, index) in responsibilityList" :key="index">
                             </el-option>

src/views/projectFront/specialWork/temporaryPowerWork.vue

@@ -8,7 +8,7 @@
                         </el-input>
                     </el-form-item>
                     <el-form-item label="作业申请单位">
-                        <el-select v-model="formInline.enterpriseId" placeholder="请选择">
+                        <el-select v-model="formInline.enterpriseId" filterable placeholder="请选择">
                             <el-option :label="item.enterpriseName" :value="item.id"
                                 v-for="(item, index) in responsibilityList" :key="index">
                             </el-option>

src/views/projectFront/specialWork/towerOverWork.vue

@@ -8,7 +8,7 @@
                         </el-input>
                     </el-form-item>
                     <el-form-item label="作业申请单位">
-                        <el-select v-model="formInline.enterpriseId" placeholder="请选择">
+                        <el-select v-model="formInline.enterpriseId" filterable placeholder="请选择">
                             <el-option :label="item.enterpriseName" :value="item.id"
                                 v-for="(item, index) in responsibilityList" :key="index">
                             </el-option>
@@ -152,7 +152,7 @@
                                 </el-select>
                             </el-form-item>
                             <el-form-item label="作业申请单位：" :label-width="formLabelWidthDetail">
-                                <el-select v-model="workDetail.jobApplicationUnit" placeholder="请选择作业申请单位" disabled>
+                                <el-select v-model="workDetail.jobApplicationUnit" filterable placeholder="请选择作业申请单位" disabled>
                                     <el-option :label="item.enterpriseName" :value="item.id"
                                         v-for="(item, index) in responsibilityList" :key="index">
                                     </el-option>