Merge branch 'master' of http://152.136.206.27:3000/dongjh/ems_client

src/views/module_cmms/submission/SubmissionList.vue

@@ -6,16 +6,22 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="送检负责人">
-              <a-input placeholder="请输入送检负责人" v-model="queryParam.verificatePerson"></a-input>
+              <!-- <a-input placeholder="请输入送检负责人" v-model="queryParam.verificatePerson"></a-input> -->
+              <j-search-select-tag v-model="queryParam.verificatePerson" placeholder="请选择负责人" dict="sys_user,realname,username"/>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="检定方式">
-              <j-dict-select-tag placeholder="请选择检定方式" v-model="queryParam.verificateMethod" dictCode="verificate_method"/>
+            <a-form-item label="送检编号">
+              <a-input placeholder="请输入送检编号" v-model="queryParam.sjcode"></a-input>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="检定方式">
+                <j-dict-select-tag placeholder="请选择检定方式" v-model="queryParam.verificateMethod" dictCode="verificate_method"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="检定单位">
                 <j-search-select-tag placeholder="请选择检定单位" v-model="queryParam.verificateClientId" dict="base_client,client_name,id"/>
               </a-form-item>
@@ -39,12 +45,12 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('送检工单表')">导出</a-button>
+      <!-- <a-button type="primary" icon="download" @click="handleExportXls('送检工单表')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
+      </a-upload> -->
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query> -->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
@@ -116,7 +122,10 @@
           <a-divider type="vertical" />
           <a @click="fankui(record)">反馈</a>
           <a-divider type="vertical" />
-          <a-dropdown>
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+          <!-- <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
               <a-menu-item>
@@ -128,7 +137,7 @@
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
-          </a-dropdown>
+          </a-dropdown> -->
         </span>
 
       </a-table>

src/views/module_cmms/submission/modules/handleDetailXq.vue

@@ -7,10 +7,104 @@
     @close="close"
     destroyOnClose
     :visible="visible">
-    <!-- <div class="drawer-footer">
-      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
-      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
-    </div> -->
+    <a-descriptions bordered>
+      <a-descriptions-item label="送检编号">
+        {{dataList.sjcode}}
+      </a-descriptions-item>
+      <a-descriptions-item label="送检人">
+        {{dataList.realname}}
+      </a-descriptions-item>
+      <a-descriptions-item label="检定方式">
+        {{dataList.verificateMethodText}}
+      </a-descriptions-item>
+      <a-descriptions-item label="检定单位">
+        {{dataList.verificateClientName}}
+      </a-descriptions-item>
+      <a-descriptions-item label="送检设备数量">
+        {{dataList.totalNum}}
+      </a-descriptions-item>
+      <a-descriptions-item label="返回设备数量">
+        {{dataList.returnNum}}
+      </a-descriptions-item>
+      <a-descriptions-item label="送检工单状态">
+        {{dataList.submissionGdstatusText}}
+      </a-descriptions-item>
+      <a-descriptions-item label="备注" :span="2">
+        {{dataList.remark}}
+      </a-descriptions-item>
+      <!-- <a-descriptions-item label="Status" :span="3">
+        <a-badge status="processing" text="Running" />
+      </a-descriptions-item> -->
+      <!-- <a-descriptions-item label="Config Info">
+        Data disk type: MongoDB
+        <br />
+        Database version: 3.4
+        <br />
+        Package: dds.mongo.mid
+        <br />
+        Storage space: 10 GB
+        <br />
+        Replication factor: 3
+        <br />
+        Region: East China 1<br />
+      </a-descriptions-item> -->
+      <a-descriptions-item label="反馈图片" :span="3">
+        <div style="display:flex; flex-wrap:wrap" >
+          <img v-for="item in dataList.uploadFileList" :key="item.fileid" :src="imgURL+item.url" height="90px" style="padding: 5px 10px 5px 0px;"/>
+        </div>
+      </a-descriptions-item>
+    </a-descriptions>
+    <a-divider orientation="left" style="font-size: 14px;"> 送检设备 </a-divider>
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="getSJSBOptions2">
+        <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="设备">
+              <!-- <j-search-select-tag placeholder="请选择设备" v-model="queryParam.equipmentid" dict="tpm_equipment,equipmentname,id"/> -->
+              <a-select placeholder="请选择设备" v-model="queryParam.equipmentid" show-search allowClear :options="deviceOption"></a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="检定结果">
+              <j-dict-select-tag placeholder="请选择检定结果" allowClear v-model="queryParam.submissionResult" dictCode="device_verification_result"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="送检状态">
+              <j-dict-select-tag placeholder="请选择送检状态" allowClear v-model="queryParam.submissionStatus" dictCode="submission_status"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24" style="padding-left:0px;">
+            <span style="float: left;overflow: hidden;">
+              <a-button type="primary" @click="getSJSBOptions3" icon="reload" style="margin-left: 8px;">重置</a-button>
+              <a-button type="primary" @click="getSJSBOptions2" icon="search">查询</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <a-table
+      size="small"
+      :scroll="{x:true}"
+      bordered
+      rowKey="id"
+      :columns="columns"
+      :dataSource="dataList.submissionEquipmentList"
+      :pagination="false"
+      class="j-table-force-nowrap">
+    </a-table>
+    <a-divider orientation="left" style="font-size: 14px;"> 操作日志 </a-divider>
+    <a-table
+      size="small"
+      :scroll="{x:true}"
+      bordered
+      rowKey="id"
+      :columns="columns2"
+      :dataSource="dataList.orderNodeSubmissionVOList"
+      :pagination="false"
+      class="j-table-force-nowrap">
+    </a-table>
   </a-drawer>
 </template>
 
@@ -23,27 +117,132 @@ import {getAction, httpAction} from "@api/manage";
     data () {
       return {
         title:"",
-        width:800,
+        width:1000,
         visible: false,
         disableSubmit: false,
+        // 设备下拉列表
+        deviceOption: [],
+        // 查询参数
+        queryParam: {},
+        // 表头
+        columns: [
+          {
+            title: '序号',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          // {
+          //   title:'送检工单id',
+          //   align:"center",
+          //   dataIndex: 'cmmsSubmissionId'
+          // },
+          {
+            title:'设备',
+            align:"center",
+            dataIndex: 'equipmentname'
+          },
+          {
+            title:'检定日期',
+            align:"center",
+            dataIndex: 'submissionDate'
+          },
+          {
+            title:'检定结果',
+            align:"center",
+            width:90,
+            dataIndex: 'submissionResultText'
+          },
+          {
+            title:'班组确认',
+            align:"center",
+            dataIndex: 'teamConfirm'
+          },
+          {
+            title:'备注',
+            align:"center",
+            dataIndex: 'remark',
+          },
+          {
+            title:'送检状态',
+            align:"center",
+            width:100,
+            dataIndex: 'submissionStatusText',
+          },
+          {
+            title:'送回日期',
+            align:"center",
+            dataIndex: 'submissionReturnDate',
+            scopedSlots: { customRender: 'submissionReturnDate' }
+          },
+          {
+            title:'有效日期',
+            align:"center",
+            dataIndex: 'submissionEffectiveDate'
+          },
+        ],
+        columns2: [
+          {
+            title:'节点名称',
+            align:"center",
+            dataIndex: 'nodename'
+          },
+          {
+            title:'日期',
+            align:"center",
+            dataIndex: 'createTime'
+          },
+        ],
         url: {
             queryById: "/cmmsSubmission/cmmsSubmission/queryById",
+            deviceList: "cmmsSubmissionEquipment/cmmsSubmissionEquipment/listByCmmsSubmissionId",
+            deviceData: "/cmmsSubmissionEquipment/cmmsSubmissionEquipment/voListByCmmsSubmissionId"
         },
+        csId: '',
+        // 详情数据
+        dataList: {
+          orderNodeSubmissionVOList: [],
+          submissionEquipmentList: [],
+          uploadFileList: []
+        },
+        imgURL: window._CONFIG['domianURL']+"/sys/common/static/"
       }
     },
     methods: {
-        findHandle(id){
-            // 获取送检详情
-            getAction(this.url.queryById, {id:id}).then((res) => {
-                console.log(77,res)
-                // this.formModel.submissionEquipmentList = res.result.submissionEquipmentList
-                // const b = res.result.uploadFileList.map((res) => {
-                // return res.url
-                // })
-                // this.formModel.uploadFileList = b.join(',')
+      findHandle(id){
+        this.csId = id
+          // 获取送检详情
+          getAction(this.url.queryById, {id:id}).then((res) => {
+              console.log(77,res)
+              this.dataList = res.result
+          })
+          getAction(this.url.deviceList, {cmmsSubmissionId:id}).then((res) => {
+            this.deviceOption = res.result.map((res) => {
+              return {
+                value: res.equipmentid,
+                label: res.equipmentname
+              }
             })
-            this.visible = true
-        },
+          })
+          this.visible = true
+      },
+      getSJSBOptions2() {
+        this.queryParam.cmmsSubmissionId = this.csId
+        getAction(this.url.deviceData, this.queryParam).then((res) => {
+          this.dataList.submissionEquipmentList = res.result
+        })
+      },
+      getSJSBOptions3() {
+        this.queryParam = {}
+        this.queryParam.cmmsSubmissionId = this.csId
+        getAction(this.url.deviceData, this.queryParam).then((res) => {
+          this.dataList.submissionEquipmentList = res.result
+        })
+      },
     //   add () {
     //     this.visible=true
     //     // this.$nextTick(()=>{