Merge remote-tracking branch 'origin/develop' into develop

.env.production

@@ -5,7 +5,7 @@ VUE_APP_TITLE = 周期性检测平台
 ENV = 'production'
 
 # 中汽研安全检测平台管理系统/生产环境
-VUE_APP_BASE_API = 'http://10.12.48.79:22032'
+VUE_APP_BASE_API = '/prod-api'
 
 # 图片服务器地址
-VUE_APP_IMAGE_API = http://10.12.48.79:22038
+VUE_APP_IMAGE_API =''

src/views/processing/carReview/write-check-form/index.vue

@@ -256,7 +256,7 @@
             保存当前条目
           </footer-button>
           <footer-button type="primary" icon="check" @click="submitFrom()"
-            >提交表格</footer-button
+            >提交表单</footer-button
           >
         </div>
       </div>
@@ -620,7 +620,7 @@ export default {
                   this.handleCircle(0)
                 }
                 this.oldForm = this.form
-                this.$modal.msgSuccess('提交表格成功')
+                this.$modal.msgSuccess('提交表单成功')
               } else {
                 this.$modal.msgError(res.msg)
               }

src/views/processing/systemReview/write-check-form/index.vue

@@ -261,7 +261,7 @@
             保存当前条目
           </footer-button>
           <footer-button type="primary" icon="check" @click="submitFrom()"
-            >提交表格</footer-button
+            >提交表单</footer-button
           >
         </div>
       </div>
@@ -630,7 +630,7 @@ export default {
                   this.handleCircle(0)
                 }
                 this.oldForm = this.form
-                this.$modal.msgSuccess('提交表格成功')
+                this.$modal.msgSuccess('提交表单成功')
               } else {
                 this.$modal.msgError(res.msg)
               }

src/views/setting/company/index.vue

@@ -93,7 +93,7 @@
       >
       </el-table-column>
       <el-table-column
-        label="邮编"
+        label="企业邮编"
         prop="postcode"
         min-width="200"
         align="left"
@@ -215,7 +215,10 @@ export default {
   methods: {
     handleDelete(id) {
       this.$modal
-
+        .confirm('是否确定删除该条数据？', {
+          title: '操作确认',
+          closeOnClickModal: false
+        })
         .then(() => {
           this.model.uuid = id
           this.model.destroy(() => {

src/views/task/new/index.vue

@@ -157,7 +157,7 @@
       </div>
       <div class="tip-navigation">
         <div class="tip"></div>
-        <div class="tip-title">小组信息</div>
+        <div class="tip-title">检验小组</div>
       </div>
       <div class="global-left-margin">
         <el-table
@@ -197,10 +197,16 @@
           <el-table-column label="所属部门" align="left" prop="dept">
             <template slot-scope="{ row }">
               <span v-if="row.userId === ''">-</span>
-              <span v-else>{{ row.dept.deptName }}</span>
+              <span v-else-if="row.dept === null"> - </span>
+              <span v-else>{{ row.dept.deptName || '-' }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="orderIndex" label="排序">
+          <el-table-column
+            prop="orderIndex"
+            label="排序"
+            width="160"
+            align="center"
+          >
             <template slot-scope="scope">
               <div v-if="scope.row.userId !== ''" class="sortable-handle">
                 <icon-park type="sort-three" size="14" fill="#F9A221" />
@@ -213,7 +219,7 @@
           <el-table-column
             width="160"
             label="操作"
-            align="left"
+            align="center"
             class-name="small-padding fixed-width"
           >
             <template slot-scope="scope">
@@ -274,7 +280,7 @@
       <!-- 零件样品信息 -->
       <div class="tip-navigation">
         <div class="tip"></div>
-        <div class="tip-title">零件样品信息</div>
+        <div class="tip-title">零部件样品信息</div>
       </div>
       <PartInfo
         v-model="partInfoArr"
@@ -420,12 +426,12 @@ export default {
         // { value: 2, label: '汽车信息安全技术要求', check: false }
       ],
       testScenarioList: [
-        { value: 1, label: 'TBOX-蜂窝以太网接口', check: false },
-        { value: 2, label: 'WiFi AP接口', check: false },
-        { value: 3, label: 'WiFi Client接口', check: false },
-        { value: 4, label: '充电以太网接口', check: false },
-        { value: 5, label: 'CAN 诊断接口（OBD）', check: false },
-        { value: 6, label: '以太网诊断接口（OBD）', check: false },
+        { value: 0, label: 'TBOX-蜂窝以太网接口', check: false },
+        { value: 1, label: 'WiFi AP接口', check: false },
+        { value: 2, label: 'WiFi Client接口', check: false },
+        { value: 3, label: '充电以太网接口', check: false },
+        { value: 4, label: 'CAN 诊断接口（OBD）', check: false },
+        { value: 5, label: '以太网诊断接口（OBD）', check: false },
         { value: 6, label: '车载摄像头以太网接口（无线）', check: false },
         { value: 7, label: '第三方应用软件', check: false },
         { value: 8, label: '远程控车应用', check: false },
@@ -439,8 +445,8 @@ export default {
         { value: 16, label: 'BLE', check: false },
         { value: 17, label: 'NFC', check: false },
         { value: 18, label: '射频钥匙', check: false },
-        { value: 20, label: '软件升级', check: false },
-        { value: 21, label: 'ECU固件', check: false }
+        { value: 19, label: '软件升级', check: false },
+        { value: 20, label: 'ECU固件', check: false }
       ],
       rules: {
         testScenarioList: [
@@ -1081,7 +1087,11 @@ export default {
             }
             this.taskCreateRequest.taskList = this.model.inspectionItemList
             this.tableData.forEach(item => {
+              if (item.dept !== null) {
                 item.deptName = item.dept.deptName
+              } else {
+                item.deptName = ''
+              }
               item.name = item.nickName
             })
             this.taskCreateRequest.auditors = this.tableData
@@ -1223,6 +1233,7 @@ export default {
 <style lang="scss" scoped>
 .add-number {
   width: 100%;
+  margin-bottom: 18px;
 }
 .global-left-margin {
   padding-left: 18px;
@@ -1243,7 +1254,9 @@ export default {
     color: #1a6fd7;
   }
 }
-
+.sortable-handle {
+  cursor: move;
+}
 .test-scenario-container {
   display: flex;
   flex-wrap: wrap;

src/views/task/task-detail/index.vue

@@ -208,7 +208,7 @@
           <el-table-column label="所属部门" align="left" prop="dept">
             <template slot-scope="{ row }">
               <span v-if="row.userId === ''">-</span>
-              <span v-else>{{ row.deptName }}</span>
+              <span v-else>{{ row.deptName || '-' }}</span>
             </template>
           </el-table-column>
         </el-table>
@@ -353,13 +353,13 @@ export default {
         // { value: 2, label: '汽车信息安全技术要求', check: false }
       ],
       testScenarioList: [
-        { value: 0, label: '文档审核', check: false },
-        { value: 1, label: 'TBOX-蜂窝以太网接口', check: false },
-        { value: 2, label: 'WiFi AP接口', check: false },
-        { value: 3, label: 'WiFi Client接口', check: false },
-        { value: 4, label: '充电以太网接口', check: false },
-        { value: 5, label: 'CAN 诊断接口（OBD）', check: false },
-        { value: 6, label: '以太网诊断接口（OBD）', check: false },
+        { value: 0, label: 'TBOX-蜂窝以太网接口', check: false },
+        { value: 1, label: 'WiFi AP接口', check: false },
+        { value: 2, label: 'WiFi Client接口', check: false },
+        { value: 3, label: '充电以太网接口', check: false },
+        { value: 4, label: 'CAN 诊断接口（OBD）', check: false },
+        { value: 5, label: '以太网诊断接口（OBD）', check: false },
+        { value: 6, label: '车载摄像头以太网接口（无线）', check: false },
         { value: 7, label: '第三方应用软件', check: false },
         { value: 8, label: '远程控车应用', check: false },
         { value: 9, label: 'USB接口', check: false },
@@ -372,9 +372,8 @@ export default {
         { value: 16, label: 'BLE', check: false },
         { value: 17, label: 'NFC', check: false },
         { value: 18, label: '射频钥匙', check: false },
-        { value: 19, label: '远程控车', check: false },
-        { value: 20, label: '软件升级', check: false },
-        { value: 21, label: 'ECU固件', check: false }
+        { value: 19, label: '软件升级', check: false },
+        { value: 20, label: 'ECU固件', check: false }
       ],
       rules: {
         testScenarioList: [
@@ -581,21 +580,22 @@ export default {
         // 小组信息
         this.tableData = this.taskDetail.auditors
         // 整车样品信息
+        if (this.taskDetail.completeVehicleSample !== null) {
           this.carInfoArr = this.taskDetail.completeVehicleSample
-        if (this.carInfoArr.length > 0) {
           this.carInfoArr.forEach(item => {
             item.sampleId = item.id
             item.flag = 0
           })
         }
         // 零件样品信息
+        if (this.taskDetail.partVehicleSample !== null) {
           this.partInfoArr = this.taskDetail.partVehicleSample
-        if (this.partInfoArr.length > 0) {
           this.partInfoArr.forEach(item => {
             item.sampleId = item.id
             item.flag = 1
           })
         }
+
         if (
           this.taskDetail.taskList.split(',').length === 1 &&
           this.taskDetail.taskList.split(',').includes('trfis')