Merge remote-tracking branch 'origin/master'

itdmWeb/src/api/api.js

@@ -178,6 +178,7 @@ const runFlowPathSaveData = (params)=>postAction("/flowpath/itdmRunFlowPathStep/
 // 通过当前流程
 const runFlowPathPass = (params)=>postAction("/flowpath/itdmRunFlowPathStep/pass",params);
 
+const runFlowPathPass1 = (params)=>postAction("/flowpath/itdmRunFlowPathStep/pass1",params);
 
 
 // 驳回上一节点
@@ -291,6 +292,7 @@ export {
   queryFlowPathSelectList,
   runFlowPathSaveData,
   runFlowPathPass,
+  runFlowPathPass1,
   runFlowPathRejectDQ,
   runFlowPathyrunList,
   runFlowPathrejectzd,

itdmWeb/src/components/tools/UserMenu.vue

@@ -178,25 +178,25 @@
       },
       handleLogout() {
         const that = this
-
-        this.$confirm({
-          title: '提示',
-          content: '真的要注销登录吗 ?',
-          onOk() {
-            return that.Logout({}).then(() => {
-              // update-begin author:scott date:20211223 for:【JTC-198】退出登录体验不好
-              //that.$router.push({ path: '/user/login' });
-              window.location.reload()
-              // update-end author:scott date:20211223 for:【JTC-198】退出登录体验不好
-            }).catch(err => {
-              that.$message.error({
-                title: '错误',
-                description: err.message
-              })
+        this.$confirm('真的要退出登录吗?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          return that.Logout({}).then(() => {
+            // update-begin author:scott date:20211223 for:【JTC-198】退出登录体验不好
+            that.$router.push({ path: '/user/login' });
+            this.$router.push({ name: 'firstIndex' })
+            window.location.reload()
+            // update-end author:scott date:20211223 for:【JTC-198】退出登录体验不好
+          }).catch(err => {
+            that.$message.error({
+              title: '错误',
+              description: err.message
             })
-          },
-          onCancel() {
-          },
+          })
+        }).catch(() => {
+
         });
       },
       updatePassword(){

itdmWeb/src/views/module-iTDM/flowpath/ItdmRunFlowPathList.vue

@@ -1,23 +1,23 @@
 <template>
-  <a-card :bordered="false">
+  <a-card :bordered='false'>
     <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="名称">
-              <a-input placeholder="请输入名称" v-model="queryParam.name"></a-input>
+    <div class='table-page-search-wrapper'>
+      <a-form layout='inline' @keyup.enter.native='searchQuery'>
+        <a-row :gutter='24'>
+          <a-col :xl='6' :lg='7' :md='8' :sm='24'>
+            <a-form-item label='名称'>
+              <a-input placeholder='请输入名称' v-model='queryParam.name'></a-input>
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="发起人">
-              <j-select-user-by-dep placeholder="请选择发起人" v-model="queryParam.faqiUser"/>
+          <a-col :xl='6' :lg='7' :md='8' :sm='24'>
+            <a-form-item label='发起人'>
+              <j-select-user-by-dep placeholder='请选择发起人' v-model='queryParam.faqiUser' />
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+          <a-col :xl='6' :lg='7' :md='8' :sm='24'>
+            <span style='float: left;overflow: hidden;' class='table-page-search-submitButtons'>
+              <a-button type='primary' @click='searchQuery' icon='search'>查询</a-button>
+              <a-button type='primary' @click='searchReset' icon='reload' style='margin-left: 8px'>重置</a-button>
 
             </span>
           </a-col>
@@ -27,75 +27,90 @@
     <!-- 查询区域-END -->
 
     <!-- 操作按钮区域 -->
-    <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-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
+    <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-upload name='file' :showUploadList='false' :multiple='false' :headers='tokenHeader' :action='importExcelUrl'
+                @change='handleImportExcel'>
+        <a-button type='primary' icon='import'>导入</a-button>
       </a-upload>
       <!-- 高级查询区域 -->
-      <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>
+      <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>
         </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+        <a-button style='margin-left: 8px'> 批量操作
+          <a-icon type='down' />
+        </a-button>
       </a-dropdown>
     </div>
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      <div class='ant-alert ant-alert-info' style='margin-bottom: 16px;'>
+        <i class='anticon anticon-info-circle ant-alert-icon'></i> 已选择 <a
+        style='font-weight: 600'>{{ selectedRowKeys.length }}</a>项
+        <a style='margin-left: 24px' @click='onClearSelected'>清空</a>
       </div>
 
       <a-table
-        ref="table"
-        size="middle"
-        :scroll="{x:true}"
+        ref='table'
+        size='middle'
+        :scroll='{x:true}'
         bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
-        @change="handleTableChange">
-
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
+        rowKey='id'
+        :columns='columns'
+        :dataSource='dataSource'
+        :pagination='ipagination'
+        :loading='loading'
+        :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
+        class='j-table-force-nowrap'
+        @change='handleTableChange'>
+
+        <template slot='htmlSlot' slot-scope='text'>
+          <div v-html='text'></div>
         </template>
-        <template slot="imgSlot" slot-scope="text,record">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        <template slot='imgSlot' slot-scope='text,record'>
+          <span v-if='!text' style='font-size: 12px;font-style: italic;'>无图片</span>
+          <img v-else :src='getImgView(text)' :preview='record.id' height='25px' alt=''
+               style='max-width:80px;font-size: 12px;font-style: italic;' />
         </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+        <template slot='fileSlot' slot-scope='text'>
+          <span v-if='!text' style='font-size: 12px;font-style: italic;'>无文件</span>
           <a-button
             v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
+            :ghost='true'
+            type='primary'
+            icon='download'
+            size='small'
+            @click='downloadFile(text)'>
             下载
           </a-button>
         </template>
 
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
+        <span slot='action' slot-scope='text, record'>
+          <a @click='tongguo(record)'>通过</a>
+          <a-divider type='vertical' />
+          <a @click='bohui(record)'>驳回</a>
+          <a-divider type='vertical' />
+          <a @click='bohui1(record)'>驳回指定节点</a>
+          <a-divider type='vertical' />
+          <a @click='handleEdit(record)'>编辑</a>
 
-          <a-divider type="vertical" />
+          <a-divider type='vertical' />
           <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
+            <a class='ant-dropdown-link'>更多 <a-icon type='down' /></a>
+            <a-menu slot='overlay'>
               <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
+                <a @click='handleDetail(record)'>详情</a>
               </a-menu-item>
               <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                <a-popconfirm title='确定删除吗?' @confirm='() => handleDelete(record.id)'>
                   <a>删除</a>
                 </a-popconfirm>
               </a-menu-item>
@@ -106,114 +121,153 @@
       </a-table>
     </div>
 
-    <itdm-run-flow-path-modal ref="modalForm" @ok="modalFormOk"></itdm-run-flow-path-modal>
+    <itdm-run-flow-path-modal ref='modalForm' @ok='modalFormOk'></itdm-run-flow-path-modal>
+    <itdm-run-flow-path-shenhel ref='bohuiForm' @ok='modalFormOk'></itdm-run-flow-path-shenhel>
+    <itdm-run-flow-path-shenhel1 ref='bohuiForm1' @ok='modalFormOk'></itdm-run-flow-path-shenhel1>
+
+
+
+
   </a-card>
 </template>
 
 <script>
 
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import ItdmRunFlowPathModal from './modules/ItdmRunFlowPathModal'
-  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
-
-  export default {
-    name: 'ItdmRunFlowPathList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      ItdmRunFlowPathModal
-    },
-    data () {
-      return {
-        description: '运行流程表管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'流程id',
-            align:"center",
-            dataIndex: 'flowPathId_dictText'
-          },
-          {
-            title:'名称',
-            align:"center",
-            dataIndex: 'name'
-          },
-          {
-            title:'发起人',
-            align:"center",
-            dataIndex: 'faqiUser_dictText'
-          },
-          {
-            title:'委托编号',
-            align:"center",
-            dataIndex: 'weituoNo'
-          },
-          {
-            title:'当前步骤id',
-            align:"center",
-            dataIndex: 'dqSetp_dictText'
-          },
-          {
-            title:'状态',
-            align:"center",
-            dataIndex: 'status'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
+import '@/assets/less/TableExpand.less'
+import { mixinDevice } from '@/utils/mixin'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import ItdmRunFlowPathModal from './modules/ItdmRunFlowPathModal'
+import { filterMultiDictText } from '@/components/dict/JDictSelectUtil'
+import { queryFlowPathSelectList, runFlowPathPass1 } from '@api/api'
+import { Modal } from 'ant-design-vue'
+import ItdmRunFlowPathShenhel from './modules/ItdmRunFlowPathShenhel.vue'
+import ItdmRunFlowPathShenhel1 from './modules/ItdmRunFlowPathShenhel1.vue'
+
+export default {
+  name: 'ItdmRunFlowPathList',
+  mixins: [JeecgListMixin, mixinDevice],
+  components: {
+    ItdmRunFlowPathModal,ItdmRunFlowPathShenhel,ItdmRunFlowPathShenhel1
+  },
+  data() {
+    return {
+      description: '运行流程表管理页面',
+      // 表头
+      columns: [
+        {
+          title: '#',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: 'center',
+          customRender: function(t, r, index) {
+            return parseInt(index) + 1
           }
-        ],
-        url: {
-          list: "/flowpath/itdmRunFlowPath/list",
-          delete: "/flowpath/itdmRunFlowPath/delete",
-          deleteBatch: "/flowpath/itdmRunFlowPath/deleteBatch",
-          exportXlsUrl: "/flowpath/itdmRunFlowPath/exportXls",
-          importExcelUrl: "flowpath/itdmRunFlowPath/importExcel",
-          
         },
-        dictOptions:{},
-        superFieldList:[],
-      }
+        {
+          title: '流程id',
+          align: 'center',
+          dataIndex: 'flowPathId_dictText'
+        },
+        {
+          title: '名称',
+          align: 'center',
+          dataIndex: 'name'
+        },
+        {
+          title: '发起人',
+          align: 'center',
+          dataIndex: 'faqiUser_dictText'
+        },
+        {
+          title: '委托编号',
+          align: 'center',
+          dataIndex: 'weituoNo'
+        },
+        {
+          title: '当前步骤id',
+          align: 'center',
+          dataIndex: 'dqSetp_dictText'
+        },
+        {
+          title: '状态',
+          align: 'center',
+          dataIndex: 'status'
+        },
+        {
+          title: '操作',
+          dataIndex: 'action',
+          align: 'center',
+          fixed: 'right',
+          width: 147,
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
+      url: {
+        list: '/flowpath/itdmRunFlowPath/list',
+        delete: '/flowpath/itdmRunFlowPath/delete',
+        deleteBatch: '/flowpath/itdmRunFlowPath/deleteBatch',
+        exportXlsUrl: '/flowpath/itdmRunFlowPath/exportXls',
+        importExcelUrl: 'flowpath/itdmRunFlowPath/importExcel'
+
+      },
+      dictOptions: {},
+      superFieldList: []
+    }
+  },
+  created() {
+    this.getSuperFieldList()
+  },
+  computed: {
+    importExcelUrl: function() {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+    }
+  },
+  methods: {
+
+    tongguo: function(record) {
+
+      Modal.confirm({
+        title: '是否通过',
+        content: '是否通过',
+        onOk() {
+          var data = { 'runFlowPath': record.id }
+          runFlowPathPass1(data).then(response => {
+            this.searchQuery();
+          })
+        },
+        onCancel() {},
+      });
+
+
     },
-    created() {
-    this.getSuperFieldList();
+    bohui: function(record) {
+      console.log('123123')
+      this.$refs.bohuiForm.bohui(record);
+
     },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
+
+    bohui1: function(record) {
+      console.log('123123')
+      this.$refs.bohuiForm1.bohui(record);
+
     },
-    methods: {
-      initDictConfig(){
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'flowPathId',text:'流程id',dictCode:''})
-        fieldList.push({type:'string',value:'name',text:'名称',dictCode:''})
-        fieldList.push({type:'sel_user',value:'faqiUser',text:'发起人'})
-        fieldList.push({type:'string',value:'weituoNo',text:'委托编号',dictCode:''})
-        fieldList.push({type:'string',value:'dqSetp',text:'当前步骤id',dictCode:"xxx,xxx,xxx"})
-        fieldList.push({type:'string',value:'status',text:'状态',dictCode:''})
-        this.superFieldList = fieldList
-      }
+
+    initDictConfig() {
+    },
+    getSuperFieldList() {
+      let fieldList = []
+      fieldList.push({ type: 'string', value: 'flowPathId', text: '流程id', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'name', text: '名称', dictCode: '' })
+      fieldList.push({ type: 'sel_user', value: 'faqiUser', text: '发起人' })
+      fieldList.push({ type: 'string', value: 'weituoNo', text: '委托编号', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'dqSetp', text: '当前步骤id', dictCode: 'xxx,xxx,xxx' })
+      fieldList.push({ type: 'string', value: 'status', text: '状态', dictCode: '' })
+      this.superFieldList = fieldList
     }
   }
+}
 </script>
 <style scoped>
-  @import '~@assets/less/common.less';
+@import '~@assets/less/common.less';
 </style>

itdmWeb/src/views/module-iTDM/flowpath/modules/ItdmFlowPathStepForm.vue

@@ -7,7 +7,6 @@
             <a-form-model-item label="流程id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="flowPathId">
               <j-search-select-tag v-model="model.flowPathId" :dictOptions='flowPathOptions' />
             </a-form-model-item>
-            </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="步骤名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">

itdmWeb/src/views/module-iTDM/flowpath/modules/ItdmRunFlowPathShenhel.vue

@@ -0,0 +1,70 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <a-form-model ref="form" :model="model">
+      <a-row>
+        <a-col :span="24">
+          <a-form-model-item label="拒绝原因" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="yuanyin">
+            <a-input v-model="model.yuanyin" placeholder="请输入拒绝原因"  ></a-input>
+          </a-form-model-item>
+        </a-col>
+      </a-row>
+    </a-form-model>
+  </a-modal>
+</template>
+
+<script>
+
+  import { runFlowPathRejectDQ } from '@api/api'
+
+  export default {
+    name: 'ItdmRunFlowPathShenhel',
+    components: {
+    },
+    data () {
+      return {
+        model:{},
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false,
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+      }
+    },
+    methods: {
+      bohui (record) {
+        this.visible=true
+        this.model = record
+      },
+      handleOk () {
+        var data = { 'runFlowPath': this.model.id,"yuanyin":this.model.yuanyin }
+        console.log(data)
+        runFlowPathRejectDQ(data).then(response => {
+          this.visible = false;
+          this.$emit('ok');
+        })
+
+      },
+
+      handleCancel () {
+        this.visible = false;
+
+      }
+
+    }
+  }
+</script>

itdmWeb/src/views/module-iTDM/flowpath/modules/ItdmRunFlowPathShenhel1.vue

@@ -0,0 +1,88 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <a-form-model ref="form" :model="model">
+      <a-row>
+
+
+        <a-col :span="24">
+          <a-form-model-item label="选择之前节点" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="flowPathId">
+            <j-search-select-tag placeholder="选择之前节点" v-model="model.runFlowPathSept" :dictOptions="yrunList"/>
+          </a-form-model-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-model-item label="拒绝原因" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="yuanyin">
+            <a-input v-model="model.yuanyin" placeholder="请输入拒绝原因"  ></a-input>
+          </a-form-model-item>
+        </a-col>
+      </a-row>
+    </a-form-model>
+  </a-modal>
+</template>
+
+<script>
+
+import { runFlowPathRejectDQ, runFlowPathrejectzd, runFlowPathyrunList } from '@api/api'
+
+  export default {
+    name: 'ItdmRunFlowPathShenhel1',
+    components: {
+    },
+    data () {
+      return {
+        yrunList:[],
+        model:{},
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false,
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+      }
+    },
+    methods: {
+      bohui (record) {
+        this.visible=true
+        this.model = record
+        var data = { 'runFlowPath': this.model.id }
+
+        runFlowPathyrunList(data).then(response => {
+          this.yrunList= response.result
+          console.log(this.yrunList)
+        })
+
+
+
+
+      },
+      handleOk () {
+        var data = { 'runFlowPath': this.model.id,"yuanyin":this.model.yuanyin,"runFlowPathSept":this.model.runFlowPathSept }
+        console.log(data)
+        runFlowPathrejectzd(data).then(response => {
+          this.visible = false;
+          this.$emit('ok');
+        })
+
+      },
+
+      handleCancel () {
+        this.visible = false;
+
+      }
+
+    }
+  }
+</script>

itdmWeb/src/views/module-iTDM/itdmYeWu/itdmBgJiaofu.vue

@@ -5,21 +5,31 @@
       <tr>
         <td class="title" style="width: 100px">试验完成时间</td>
         <td class="content" style="width: 360px">
-          <div style="width: 440px"></div>
+          <!-- <div style="width: 440px"></div> -->
+          <input v-model="tableData.wanChengTime" style="text-align: center" />
         </td>
         <td class="title white" style="width: 100px">添加归档材料</td>
         <td class="content" style="width: 450px">
-          <input v-model="tableData.shuruLeixing" style="text-align: center" />
+          <j-upload v-model="fileList" text="上传"></j-upload>
+          <!-- <input id="excel" type="file" name="excel"
+            @change="getFilePath"
+          /> -->
+          <!-- <div class="import-content">
+            <el-button @click="daoruButton">点击进行导入明细表</el-button>
+            <div class="excel">{{ excel }}</div>
+          </div> -->
         </td>
       </tr>
       <tr>
         <td class="title" style="width: 100px">添加试验报告</td>
         <td class="content" style="width: 360px">
-          <div style="width: 440px"></div>
+          <j-upload v-model="fileListBg" text="上传"></j-upload>
+          <!-- <div style="width: 440px"></div> -->
         </td>
         <td class="title white" style="width: 100px">质量审核</td>
         <td class="content" style="width: 450px">
-          <input v-model="tableData.shuruLeixing" style="text-align: center" />
+          <div class="btn" style="margin-right:1.1%" @click="addSubTable">提交</div>
+          <!-- <input v-model="tableData.shuruLeixing" style="text-align: center" /> -->
         </td>
       </tr>
       <tr>
@@ -35,7 +45,8 @@
       <tr>
         <td class="title" style="width: 100px">报告办理</td>
         <td class="content" style="width: 360px">
-          <div style="width: 440px"></div>
+          <j-upload v-model="fileListBl" text="上传"></j-upload>
+          <!-- <div style="width: 440px"></div> -->
         </td>
         <td class="title white" style="width: 100px">报告接收</td>
         <td class="content" style="width: 450px">
@@ -50,7 +61,8 @@
         <!-- <td class="content" style="width: 100px" colspan="2"></td> -->
         <td class="title white" style="width: 100px">报告归档</td>
         <td class="content" style="width: 450px">
-          <input v-model="tableData.shuruLeixing" style="text-align: center" />
+          <div class="btn" style="margin-right:1.1%" @click="addSubTable">提交</div>
+          <!-- <input v-model="tableData.shuruLeixing" style="text-align: center" /> -->
         </td>
       </tr>
     </table>
@@ -58,8 +70,10 @@
 </template>
 
 <script>
+import JUpload from '@/components/jeecg/JUpload'
 export default {
     name: 'itdmBgJiaofu',
+    components: { JUpload },
     data() {
         return {
             tableData: {
@@ -68,9 +82,32 @@ export default {
                   total: 0,
                 },
               ],
+              // 完成时间
+              wanChengTime: '',
             },
+            // 添加归档材料
+            fileList:[],
+            // 添加试验报告
+            fileListBg:[],
+            // 报告办理
+            fileListBl:[],
+            // 导入excel
+            excel: '',
         }
     },
+    methods: {
+      // 点击导入excel
+      daoruButton() {
+        document.getElementById('excel').click()
+      },
+      getFilePath(e) {
+        this.excel = document.getElementById('excel').files[0].name
+        console.log(this.excel)
+      },
+      addSubTable() {
+        console.log(this.fileList)
+      }
+    }
 }
 </script>
 

itdmWeb/src/views/module-iTDM/itdmYeWu/itdmXqPingshen.vue

@@ -3,7 +3,7 @@
     <div class="head">第二部分　试验需求评审</div>
     <table class="main-table">
       <tr>
-        <td class="title" style="width: 100px">技术线</td>
+        <td class="title" style="width: 100px;">技术线</td>
         <td class="content" style="width: 440px;">
           <div>
             <el-checkbox-group v-model="tableData.checkList">
@@ -24,8 +24,8 @@
             </el-checkbox-group>
           </div>
         </td>
-        <td class="title white" style="width: 100px">产品线</td>
-        <td class="content" style="width: 440px">
+        <td class="title white" style="width: 100px;">产品线</td>
+        <td class="content" style="width: 440px;">
           <el-checkbox-group v-model="tableData.checkList2">
             <div class="jishuxian" style="justify-content: center;">
               <el-checkbox label="检测试验"></el-checkbox>
@@ -35,22 +35,22 @@
         </td>
       </tr>
       <tr>
-        <td class="title" style="width: 100px">试验分级</td>
-        <td class="content" style="width: 440px">
+        <td class="title" style="width: 100px;">试验分级</td>
+        <td class="content" style="width: 440px;">
           <div style="display: flex;justify-content: center;color: red;align-items:center;">重要性系数：
             <input v-model="tableData.factor"/>
           </div>
         </td>
         <td class="title white" style="width: 100px">重要性标准</td>
         <td class="content" style="width: 450px">
-          <div class="jishuxian" style="justify-content: center;">气候试验：0.40　　力学试验：0.70　　力学/气候：0.55</div>
-          <div class="jishuxian" style="justify-content: center;">重要试验：1.00　　非标试验：1.00</div>
+          <div class="jishuxian" style="justify-content: center;">气候试验：0.40　　力学试验：0.70　　重要/非标试验：1.00</div>
+          <!-- <div class="jishuxian" style="justify-content: center;">重要试验：1.00　　非标试验：1.00</div> -->
         </td>
       </tr>
       <tr>
-        <td class="title" style="width: 100px">试验等级</td>
-        <td class="content" style="width: 360px">
-          <div style="display: flex; align-items: flex-end">
+        <td class="title" style="width: 100px;">试验等级</td>
+        <td class="content" style="width: 360px;">
+          <div style="display: flex; align-items: flex-end;">
             <table>
               <tr>
                 <td>序号</td>
@@ -70,15 +70,15 @@
             <div class="addRow" style="margin-right:1.1%" @click="addRow">添加</div>
           </div>
         </td>
-        <td class="title white" style="width: 100px">备注</td>
-        <td class="content" style="width: 450px">
+        <td class="title white" style="width: 100px;">备注</td>
+        <td class="content" style="width: 450px;">
           <input v-model="tableData.shuruLeixing" style="text-align: center" />
         </td>
       </tr>
       <tr>
-        <td class="title" style="width: 100px">三外需求</td>
-        <td class="content" style="width: 360px" colspan="3">
-          <div style="display: flex; align-items: flex-end">
+        <td class="title" style="width: 100px;">三外需求</td>
+        <td class="content" style="width: 360px;" colspan="3">
+          <div style="display: flex; align-items: flex-end;">
             <table>
               <tr>
                 <td>序号</td>
@@ -104,28 +104,30 @@
                 <td style="font-weight: bold;">{{ totalCleanPrice }}</td>
               </tr>
             </table>
-            <div class="addRow" style="margin-right:1.1%" @click="addRow2">添加</div>
+            <div class="addRow" @click="addRow2">添加</div>
+            <div class="btn" style="margin-right:1.1%" @click="addSubTable">提交</div>
           </div>
         </td>
       </tr>
       <tr>
-        <td class="title" style="width: 100px">评审结论</td>
-        <td class="content" style="width: 360px">
+        <td class="title" style="width: 100px;">评审结论</td>
+        <td class="content" style="width: 360px;">
           <el-radio-group v-model="tableData.radio">
             <el-radio :label="1">可以满足</el-radio>
             <el-radio :label="2">部分满足</el-radio>
             <el-radio :label="3">不能满足</el-radio>
           </el-radio-group>
         </td>
-        <td class="title white" style="width: 100px">主审人</td>
-        <td class="content" style="width: 450px">
+        <td class="title white" style="width: 100px;">主审人</td>
+        <td class="content" style="width: 450px;">
           <!-- <input v-model="tableData.shuruLeixing" style="text-align: center" /> -->
         </td>
       </tr>
       <tr>
-        <td class="title" style="width: 100px" colspan="2">项目流转</td>
-        <td class="title white" style="width: 100px">工程技术部部长</td>
-        <td class="content" style="width: 450px">
+        <td class="title" style="width: 100px;" colspan="2">项目流转</td>
+        <td class="title white" style="width: 100px;">工程技术部部长</td>
+        <td class="content" style="width: 450px;" >
+          <div class="btn" style="position: absolute;right: 3%;" @click="addSubTable">提交</div>
           <!-- <input v-model="tableData.shuruLeixing" style="text-align: center" /> -->
         </td>
       </tr>
@@ -187,6 +189,10 @@ export default {
       delRow2(index) {
         this.tableData.demandSanwai.splice(index, 1)
       },
+      addSubTable() {
+        console.log(this.tableData.cleanPrice)
+        console.log(this.tableData)
+      },
     }
 }
 </script>
@@ -227,15 +233,16 @@ tr {
   cursor: pointer;
 }
 .btn {
-  display: inline-block;
+  /* display: inline-block; */
+  width: 60px;
+  height: 24px;
   padding: 2px 10px;
   font-size: 13px;
   border: 1px solid rgb(3, 188, 244);
   color: rgb(8, 187, 241);
   border-radius: 4px;
   cursor: pointer;
-  position: absolute;
-  right: 3%;
+  margin-left: 20px;
 }
 .delBtn {
   padding: 3px 10px;

itdmWeb/src/views/user/firstIndex.vue

@@ -7,7 +7,7 @@
       <div class="common-system system-iTDM" ref="systemiTDM" @click="chooseSystem('/dashboard/analysis')"></div>
     </div>
 </template>
-  
+
   <script>
   export default {
     name: '',
@@ -22,7 +22,7 @@
       // 设置定时器--因为初始执行方法时img没有加载完，所以获取不到高度；定时一段时间等img加载之后再执行
       this.timer = setTimeout(() => {
         this.setSystemStyle()
-      }, 100)
+      }, 1000)
       // this.$nextTick(() => {
       // })
       window.addEventListener('resize', this.setSystemStyle)
@@ -58,7 +58,7 @@
     }
   }
   </script>
-  
+
   <style lang="scss">
   .chooseSystem-container{
     width: 100%;
@@ -98,4 +98,3 @@
     }
   }
   </style>
-