Merge remote-tracking branch 'origin/master'

itdmWeb/src/views/module-iTDM/itdmDevice/ItdmDeviceList.vue

@@ -6,12 +6,12 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="设备名称">
-              <a-input placeholder="请输入设备名称" v-model="queryParam.deviceName"></a-input>
+              <a-input placeholder="请输入设备名称" v-model="queryParam.deviceName" disabled></a-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="设备编号">
-              <a-input placeholder="请输入设备编号" v-model="queryParam.deviceNo"></a-input>
+            <a-form-item label="设备类型">
+              <a-input placeholder="请输入设备类型" v-model="queryParam.deviceType"></a-input>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
@@ -21,11 +21,6 @@
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="设备类型">
-                <a-input placeholder="请输入设备类型" v-model="queryParam.deviceType"></a-input>
-              </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.isRepair" dictCode="is_repair"/>
               </a-form-item>
@@ -175,6 +170,11 @@
             dataIndex: 'deviceName'
           },
           {
+            title:'设备类型',
+            align:"center",
+            dataIndex: 'deviceType'
+          },
+          {
             title:'设备编号',
             align:"center",
             dataIndex: 'deviceNo'
@@ -185,11 +185,6 @@
             dataIndex: 'deviceStatus_dictText'
           },
           {
-            title:'设备类型',
-            align:"center",
-            dataIndex: 'deviceType'
-          },
-          {
             title:'维护时间',
             align:"center",
             dataIndex: 'repairTime'
@@ -200,6 +195,16 @@
             dataIndex: 'repairer'
           },
           {
+            title:'维护记录',
+            align:"center",
+            dataIndex: 'record'
+          },
+          {
+            title:'设备型号',
+            align:"center",
+            dataIndex: 'deviceModel'
+          },
+          {
             title:'本次运行开始时间',
             align:"center",
             dataIndex: 'runStartTime'
@@ -229,7 +234,7 @@
           deleteBatch: "/itdmDevice/itdmDevice/deleteBatch",
           exportXlsUrl: "/itdmDevice/itdmDevice/exportXls",
           importExcelUrl: "itdmDevice/itdmDevice/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
@@ -251,17 +256,19 @@
         fieldList.push({type:'string',value:'updateBy',text:'更新人',dictCode:''})
         fieldList.push({type:'datetime',value:'updateTime',text:'更新日期'})
         fieldList.push({type:'string',value:'deviceName',text:'设备名称',dictCode:''})
+        fieldList.push({type:'string',value:'deviceType',text:'设备类型',dictCode:''})
         fieldList.push({type:'string',value:'deviceNo',text:'设备编号',dictCode:''})
         fieldList.push({type:'int',value:'deviceStatus',text:'设备状态',dictCode:'device_status'})
-        fieldList.push({type:'string',value:'deviceType',text:'设备类型',dictCode:''})
         fieldList.push({type:'datetime',value:'repairTime',text:'维护时间'})
         fieldList.push({type:'string',value:'repairer',text:'维护人',dictCode:''})
+        fieldList.push({type:'string',value:'record',text:'维护记录',dictCode:''})
+        fieldList.push({type:'string',value:'deviceSpecification',text:'设备规格',dictCode:''})
+        fieldList.push({type:'string',value:'deviceModel',text:'设备型号',dictCode:''})
+        fieldList.push({type:'string',value:'deviceLife',text:'计量有效期',dictCode:''})
         fieldList.push({type:'datetime',value:'runStartTime',text:'本次运行开始时间'})
         fieldList.push({type:'int',value:'biaoshi',text:'设备运行标识',dictCode:'biaoshi'})
         fieldList.push({type:'int',value:'isRepair',text:'是否已维护',dictCode:'is_repair'})
         fieldList.push({type:'int',value:'equipmenttreeid',text:'设备树id',dictCode:''})
-        fieldList.push({type:'string',value:'deviceLife',text:'计量有效期',dictCode:''})
-        fieldList.push({type:'string',value:'spec',text:'规格型号',dictCode:''})
         fieldList.push({type:'string',value:'address',text:'安装地点',dictCode:''})
         fieldList.push({type:'int',value:'specid',text:'区域',dictCode:''})
         fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})

itdmWeb/src/views/module-iTDM/itdmDevice/modules/ItdmDeviceForm.vue

@@ -4,18 +4,13 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="更新人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="updateBy">
-              <a-input v-model="model.updateBy" placeholder="请输入更新人"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="更新日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="updateTime">
-              <j-date placeholder="请选择更新日期"  v-model="model.updateTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            <a-form-model-item label="设备名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deviceName">
+              <a-input v-model="model.deviceName" placeholder="请输入设备名称"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="设备名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deviceName">
-              <a-input v-model="model.deviceName" placeholder="请输入设备名称"  ></a-input>
+            <a-form-model-item label="设备类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deviceType">
+              <a-input v-model="model.deviceType" placeholder="请输入设备类型"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -29,11 +24,6 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="设备类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deviceType">
-              <a-input v-model="model.deviceType" placeholder="请输入设备类型"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
             <a-form-model-item label="维护时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repairTime">
               <j-date placeholder="请选择维护时间"  v-model="model.repairTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
             </a-form-model-item>
@@ -44,6 +34,26 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
+            <a-form-model-item label="维护记录" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="record">
+              <a-input v-model="model.record" placeholder="请输入维护记录"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="设备规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deviceSpecification">
+              <a-input v-model="model.deviceSpecification" placeholder="请输入设备规格"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="设备型号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deviceModel">
+              <a-input v-model="model.deviceModel" placeholder="请输入设备型号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="计量有效期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deviceLife">
+              <a-input v-model="model.deviceLife" placeholder="请输入计量有效期"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
             <a-form-model-item label="本次运行开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="runStartTime">
               <j-date placeholder="请选择本次运行开始时间"  v-model="model.runStartTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
             </a-form-model-item>
@@ -64,16 +74,6 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="计量有效期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deviceLife">
-              <a-input v-model="model.deviceLife" placeholder="请输入计量有效期"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="规格型号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="spec">
-              <a-input v-model="model.spec" placeholder="请输入规格型号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
             <a-form-model-item label="安装地点" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
               <a-input v-model="model.address" placeholder="请输入安装地点"  ></a-input>
             </a-form-model-item>
@@ -131,6 +131,9 @@
            deviceNo: [
               { required: true, message: '请输入设备编号!'},
            ],
+           deviceStatus: [
+              { required: true, message: '请输入设备状态!'},
+           ],
         },
         url: {
           add: "/itdmDevice/itdmDevice/add",

itdmWeb/src/views/module-iTDM/moban/ItdmMobanList.vue

@@ -0,0 +1,216 @@
+<template>
+  <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>
+            </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.type" dict=",,"/>
+            </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 @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-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>
+      </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>
+        </a-menu>
+        <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>
+
+      <a-table
+        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>
+        </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>
+        <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)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <itdm-moban-modal ref="modalForm" @ok="modalFormOk"></itdm-moban-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ItdmMobanModal from './modules/ItdmMobanModal'
+  import { filterMultiDictText } from '@comp/dict/JDictSelectUtil'
+  import { ajaxGetDictItems } from '@api/api'
+
+  export default {
+    name: 'ItdmMobanList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      ItdmMobanModal
+    },
+    data () {
+      return {
+        description: '模板管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'模板名称',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'模板类型',
+            align:"center",
+            dataIndex: 'type',
+            customRender: (text) => (text ? filterMultiDictText(this.dictOptions['muban.type'], text) : '')
+
+          },
+          {
+            title:'模板地址',
+            align:"center",
+            dataIndex: 'filePath',
+            scopedSlots: {customRender: 'fileSlot'}
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/moban/itdmMoban/list",
+          delete: "/moban/itdmMoban/delete",
+          deleteBatch: "/moban/itdmMoban/deleteBatch",
+          exportXlsUrl: "/moban/itdmMoban/exportXls",
+          importExcelUrl: "moban/itdmMoban/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+
+    methods: {
+      initDictConfig(){
+        ajaxGetDictItems('muban.type').then((res) => {
+          if (res.success) {
+            console.log(res.result)
+            this.$set(this.dictOptions, 'muban.type', res.result)
+          }
+        })
+
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'name',text:'模板名称'})
+        fieldList.push({type:'string',value:'type',text:'模板类型'})
+        fieldList.push({type:'Text',value:'filePath',text:'模板地址'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

itdmWeb/src/views/module-iTDM/moban/modules/ItdmMobanForm.vue

@@ -0,0 +1,123 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="模板名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="model.name" placeholder="请输入模板名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="模板类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
+              <j-search-select-tag v-model="model.type" dict="muban.type"  />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="模板地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="filePath">
+              <j-upload v-model="model.filePath"   ></j-upload>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'ItdmMobanForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+          name: [
+            { required: true, message: '请输入模板名称!'},
+          ],
+          type: [
+            { required: true, message: '请输入模板类型!'},
+          ],
+          filePath: [
+            { required: true, message: '请输入模板地址!'},
+          ],
+        },
+        url: {
+          add: "/moban/itdmMoban/add",
+          edit: "/moban/itdmMoban/edit",
+          queryById: "/moban/itdmMoban/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+
+        })
+      },
+    }
+  }
+</script>

itdmWeb/src/views/module-iTDM/moban/modules/ItdmMobanModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <itdm-moban-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></itdm-moban-form>
+    <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-drawer>
+</template>
+
+<script>
+
+  import ItdmMobanForm from './ItdmMobanForm'
+
+  export default {
+    name: 'ItdmMobanModal',
+    components: {
+      ItdmMobanForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

itdmWeb/src/views/module-iTDM/moban/modules/ItdmMobanModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <itdm-moban-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></itdm-moban-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import ItdmMobanForm from './ItdmMobanForm'
+  export default {
+    name: 'ItdmMobanModal',
+    components: {
+      ItdmMobanForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

itdmWeb/src/views/module-iTDM/weituo/modules/ItdmWeituoInfoForm.vue

@@ -8,9 +8,9 @@
       <a-step title="填写试验信息" />
     </a-steps>
     <div class="content">
-      <step1 v-if="currentTab === 0" ref="data001" @nextStep="nextStep" />
-      <step2 v-if="currentTab === 1" @prevStep="prevStep" @nextStep="nextStep" />
-      <step3 v-if="currentTab === 2" @submitForm="submitForm" @prevStep="prevStep" />
+      <step1 v-if="currentTab === 0" ref="data001" @nextStep="nextStep"   :disabled="disabled"/>
+      <step2 v-if="currentTab === 1" @prevStep="prevStep" @nextStep="nextStep"  :disabled="disabled" />
+      <step3 v-if="currentTab === 2" @submitForm="submitForm" @prevStep="prevStep" :disabled="disabled" />
     </div>
   </a-card>
 

itdmWeb/src/views/module-iTDM/weituo/modules/step/Step1.vue

@@ -5,32 +5,32 @@
     <a-row>
       <a-col :span="24">
         <a-form-model-item label="委托单位名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="weituoClient">
-          <a-input v-model="model.weituoClient" placeholder="请输入委托单位名称"></a-input>
+          <a-input v-model="model.weituoClient" placeholder="请输入委托单位名称" :disabled="formDisabled"></a-input>
         </a-form-model-item>
       </a-col>
       <a-col :span="24">
         <a-form-model-item label="委托单位地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="weituoAddress">
-          <a-input v-model="model.weituoAddress" placeholder="请输入委托单位地址"></a-input>
+          <a-input v-model="model.weituoAddress" placeholder="请输入委托单位地址" :disabled="formDisabled"></a-input>
         </a-form-model-item>
       </a-col>
       <a-col :span="24">
         <a-form-model-item label="委托联系人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="weituoLxr">
-          <a-input v-model="model.weituoLxr" placeholder="请输入委托联系人"></a-input>
+          <a-input v-model="model.weituoLxr" placeholder="请输入委托联系人" :disabled="formDisabled"></a-input>
         </a-form-model-item>
       </a-col>
       <a-col :span="24">
         <a-form-model-item label="委托电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="weituoPhone">
-          <a-input v-model="model.weituoPhone" placeholder="请输入委托电话"></a-input>
+          <a-input v-model="model.weituoPhone" placeholder="请输入委托电话" :disabled="formDisabled" ></a-input>
         </a-form-model-item>
       </a-col>
       <a-col :span="24">
         <a-form-model-item label="委托邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="weituoEmail">
-          <a-input v-model="model.weituoEmail" placeholder="请输入委托邮箱"></a-input>
+          <a-input v-model="model.weituoEmail" placeholder="请输入委托邮箱" :disabled="formDisabled" ></a-input>
         </a-form-model-item>
       </a-col>
       <a-col :span="24">
         <a-form-model-item label="报告用章" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bgyz">
-          <j-dict-select-tag v-model="model.bgyz" placeholder="请选择报告形式"
+          <j-dict-select-tag v-model="model.bgyz" placeholder="请选择报告形式" :disabled="formDisabled"
                              dictCode="weituo.bgyz" />
         </a-form-model-item>
       </a-col>
@@ -38,21 +38,21 @@
         <a-form-model-item label="报告形式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bgxs">
 
 
-          <j-dict-select-tag v-model="model.bgxs" placeholder="请选择报告形式"
+          <j-dict-select-tag v-model="model.bgxs" placeholder="请选择报告形式" :disabled="formDisabled"
                              dictCode="weituo.bgxs" />
 
         </a-form-model-item>
       </a-col>
       <a-col :span="24">
         <a-form-model-item label="特殊要求" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="teshuyaoqiu">
-          <a-textarea v-model="model.teshuyaoqiu" placeholder="请输入特殊要求"></a-textarea>
+          <a-textarea v-model="model.teshuyaoqiu" placeholder="请输入特殊要求" :disabled="formDisabled"></a-textarea>
         </a-form-model-item>
       </a-col>
 
       <a-col :span="24">
         <a-form-model-item label="试验条件文件地址" :labelCol="labelCol" :wrapperCol="wrapperCol"
                            prop="tiaojianFile">
-          <j-upload v-model="model.tiaojianFile"></j-upload>
+          <j-upload v-model="model.tiaojianFile" :disabled="formDisabled"></j-upload>
         </a-form-model-item>
       </a-col>
     </a-row>
@@ -61,6 +61,7 @@
     </a-form-item>
   </a-form-model>
 
+
 </template>
 
 <script>
@@ -70,6 +71,14 @@ import { validateDuplicateValue } from '@/utils/util'
 
 export default {
   name: 'step1',
+  props: {
+    //表单禁用
+    disabled: {
+      type: Boolean,
+      default: false,
+      required: false
+    }
+  },
   components: {},
   data() {
     return {
@@ -115,6 +124,11 @@ export default {
   created() {
 
   },
+  computed: {
+    formDisabled(){
+      return this.disabled
+    },
+  },
 
   methods: {
 

itdmWeb/src/views/module-iTDM/weituo/modules/step/Step2.vue

@@ -1,5 +1,4 @@
 <template>
-
   <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
     <a-table
       :columns="columns"
@@ -10,6 +9,7 @@
         v-for="(col, i) in ['sampleName', 'sampleModelSpecification', 'sampleQuantities','sampleManufacturer']"
         :slot="col" slot-scope="text, record, index">
         <a-input
+          :disabled="formDisabled"
           :key="col"
           style="margin: -5px 0"
           :value="text"
@@ -23,14 +23,14 @@
       <template slot="operation" slot-scope="text, record, index">
           <span>
               <a-divider type="vertical" />
-              <a-popconfirm title="是否要删除此行？" @confirm="remove(record.key)">
+              <a-popconfirm title="是否要删除此行？" :disabled="formDisabled"  @confirm="remove(record.key)">
                 <a>删除</a>
               </a-popconfirm>
             </span>
       </template>
     </a-table>
-    <a-button style="width: 100%; margin-top: 16px; margin-bottom: 8px" type="dashed" icon="plus" @click="newMember">
-      新增成员
+    <a-button style="width: 100%; margin-top: 16px; margin-bottom: 8px" type="dashed" :disabled="formDisabled" icon="plus" @click="newMember">
+      新增样品
     </a-button>
 
 
@@ -50,8 +50,14 @@
 
 export default {
   name: 'step2',
-
-  props: {},
+  props: {
+    //表单禁用
+    disabled: {
+      type: Boolean,
+      default: false,
+      required: false
+    }
+  },
   data() {
     return {
       count: 1,
@@ -112,6 +118,11 @@ export default {
       data: []
     }
   },
+  computed: {
+    formDisabled(){
+      return this.disabled
+    },
+  },
   created() {
     const data = JSON.parse(sessionStorage.getItem('yangpin'))
     if (data != null) {

itdmWeb/src/views/module-iTDM/weituo/modules/step/Step3.vue

@@ -1,92 +1,96 @@
 <template>
-
-  <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
-    <a-table
-      :columns="columns"
-      :dataSource="data"
-      :pagination="false"
-    >
-
-
-      <template v-for="(col, i) in ['yangpinKeyId', 'testItems', 'standardRequirement','judgementBasis','beizhu']"
-                :slot="col" slot-scope="text, record, index">
-
-
-        <a-select
-          :key="col"
-          v-if="record.editable && col==='yangpinKeyId'"
-          style="margin: -5px 0"
-          :value="text"
-          :placeholder="columns[i].title"
-
-          @change="e => handleChange(e, record.key, col)">
-
-          <a-select-option v-for="d in yangpins" :key="d.key">
-            {{ d.sampleName }}
-          </a-select-option>
-        </a-select>
-
-
-        <a-input
-          :key="col"
-          v-if="record.editable && col==='testItems'"
-          style="margin: -5px 0"
-          :value="text"
-          :placeholder="columns[i].title"
-          @change="e => handleChange(e.target.value, record.key, col)"></a-input>
-
-
-        <j-search-select-tag
-          :key="col"
-          v-if="record.editable && col==='standardRequirement'"
-          style="margin: -5px 0"
-          :value="text"
-          :placeholder="columns[i].title" @change="e=>handleChange(e, record.key, col)"
-          dict="itdm_weituo_yiju,name,name" />
-
-        <a-input
-          :key="col"
-          v-if="record.editable && col==='judgementBasis'"
-          style="margin: -5px 0"
-          :value="text"
-          :placeholder="columns[i].title"
-          @change="e => handleChange(e.target.value, record.key, col)"></a-input>
-
-
-        <a-input
-          :key="col"
-          v-if="record.editable && col==='beizhu'"
-          style="margin: -5px 0"
-          :value="text"
-          :placeholder="columns[i].title"
-          @change="e => handleChange(e.target.value, record.key, col)"></a-input>
-
-
-      </template>
-
-      <template slot="operation" slot-scope="text, record, index">
+    <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+      <a-table
+        :columns="columns"
+        :dataSource="data"
+        :pagination="false"
+      >
+
+
+        <template v-for="(col, i) in ['yangpinKeyId', 'testItems', 'standardRequirement','judgementBasis','beizhu']"
+                  :slot="col" slot-scope="text, record, index">
+
+
+          <a-select
+            :disabled="formDisabled"
+            :key="col"
+            v-if="record.editable && col==='yangpinKeyId'"
+            style="margin: -5px 0"
+            :value="text"
+            :placeholder="columns[i].title"
+
+            @change="e => handleChange(e, record.key, col)">
+
+            <a-select-option v-for="d in yangpins" :key="d.key">
+              {{ d.sampleName }}
+            </a-select-option>
+          </a-select>
+
+
+          <a-input
+            :disabled="formDisabled"
+            :key="col"
+            v-if="record.editable && col==='testItems'"
+            style="margin: -5px 0"
+            :value="text"
+            :placeholder="columns[i].title"
+            @change="e => handleChange(e.target.value, record.key, col)"></a-input>
+
+
+          <j-search-select-tag
+            :disabled="formDisabled"
+            :key="col"
+            v-if="record.editable && col==='standardRequirement'"
+            style="margin: -5px 0"
+            :value="text"
+            :placeholder="columns[i].title" @change="e=>handleChange(e, record.key, col)"
+            dict="itdm_weituo_yiju,name,name" />
+
+          <a-input
+            :disabled="formDisabled"
+            :key="col"
+            v-if="record.editable && col==='judgementBasis'"
+            style="margin: -5px 0"
+            :value="text"
+            :placeholder="columns[i].title"
+            @change="e => handleChange(e.target.value, record.key, col)"></a-input>
+
+
+          <a-input
+            :disabled="formDisabled"
+            :key="col"
+            v-if="record.editable && col==='beizhu'"
+            style="margin: -5px 0"
+            :value="text"
+            :placeholder="columns[i].title"
+            @change="e => handleChange(e.target.value, record.key, col)"></a-input>
+
+
+        </template>
+
+        <template slot="operation" slot-scope="text, record, index">
           <span>
               <a-divider type="vertical" />
-              <a-popconfirm title="是否要删除此行？" @confirm="remove(record.key)">
+              <a-popconfirm  :disabled="formDisabled" title="是否要删除此行？" @confirm="remove(record.key)">
                 <a>删除</a>
               </a-popconfirm>
             </span>
-      </template>
+        </template>
 
 
-    </a-table>
-    <a-button style="width: 100%; margin-top: 16px; margin-bottom: 8px" type="dashed" icon="plus" @click="newMember">
-      新增成员
-    </a-button>
+      </a-table>
+      <a-button :disabled="formDisabled" style="width: 100%; margin-top: 16px; margin-bottom: 8px" type="dashed" icon="plus" @click="newMember">
+        新增试验信息
+      </a-button>
 
 
-    <a-form-item :wrapperCol="{span: 19, offset: 5}">
-      <a-button style="margin-left: 8px" @click="prevStep">上一步</a-button>
-      <a-button style="margin-left: 8px" @click="submitForm">提交</a-button>
+      <a-form-item :wrapperCol="{span: 19, offset: 5}">
+        <a-button style="margin-left: 8px" @click="prevStep">上一步</a-button>
+        <a-button v-if="!disabled" style="margin-left: 8px" @click="submitForm">提交</a-button>
 
 
-    </a-form-item>
-  </a-form-model>
+      </a-form-item>
+    </a-form-model>
 
 
 </template>
@@ -97,7 +101,14 @@
 export default {
   name: 'step3',
 
-  props: {},
+  props: {
+    //表单禁用
+    disabled: {
+      type: Boolean,
+      default: false,
+      required: false
+    }
+  },
   data() {
     return {
       yangpins: {},
@@ -152,12 +163,16 @@ export default {
       data: []
     }
   },
-
+  computed: {
+    formDisabled() {
+      return this.disabled
+    }
+  },
   created() {
     const data = JSON.parse(sessionStorage.getItem('yangpinkz'))
 
     if (data != null) {
-      for (let  xx of data) {
+      for (let xx of data) {
         this.data.push({
           key: xx.key,
           yangpinKeyId: xx.yangpinKeyId,
@@ -180,7 +195,6 @@ export default {
 
     this.count = sessionStorage.getItem('count1') != null ? Number(sessionStorage.getItem('count1')) : 1
 
-
   },
   methods: {
 
@@ -222,7 +236,6 @@ export default {
     submitForm() {
       sessionStorage.setItem('yangpinkz', JSON.stringify(this.data))
 
-
       // this.$refs.form.validate(valid => {
       //   if (valid) {
       this.$emit('submitForm')