技能博物馆-固定资产

src/views/activiti/form/departmentModal.vue

@@ -0,0 +1,218 @@
+<template>
+  <div id="departmentModal">
+    <a-modal
+      title=""
+      v-model="departmentModVis"
+      @cancel="handleCancel"
+      width="80%"
+      style="top:330px;left:100px;"
+    >
+
+      <!-- 増行 子表 -->
+      <a-card :bordered="false" style="margin:10px 0">
+        <!-- 子表 -->
+          <a-form-model ref="formRef">
+            <a-table
+              v-if="departMentata"
+              bordered
+              rowKey="id"
+              :columns="departmentColumns"
+              :data-source="departMentata"
+              :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+              :pagination="false"
+               :scroll="{x:2100,y: 300}"
+            >
+              
+            </a-table>
+          </a-form-model>
+      </a-card>
+
+      <!-- 页面底部保存取消 -->
+      <div
+        :style="{
+          position: 'absolute',
+          right: 0,
+          bottom: 0,
+          width: '100%',
+          borderTop: '1px solid #e9e9e9',
+          padding: '10px 16px',
+          background: '#fff',
+          textAlign: 'right',
+          zIndex: 1
+        }"
+      >
+        <a-popconfirm title="确定放弃？" @confirm="close" okText="确定" cancelText="取消">
+          <a-button :style="{ marginRight: '8px' }">返回</a-button>
+        </a-popconfirm>
+        <a-button type="primary" @click="addSave">
+          确认
+        </a-button>
+      </div>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import JEllipsis from '@/components/jeecg/JEllipsis'
+import moment from 'moment'
+import {getClass} from '@api/oa/cd-personnel-files'
+
+export default {
+  name: 'DepartmentModal', // 报关要素
+  mixins: [JeecgListMixin],
+  components: { JEllipsis, moment },
+
+  data() {
+    let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} /> // 省略
+
+    return {
+      loading: false, // 表格加载
+      pushState: false, //是否推送
+      // 子表表头
+      departmentColumns: [ 
+        {
+          title: '机构/部门名称',
+          dataIndex: 'departName',
+          width: 140,
+          ellipsis: true,
+          className: 'replacecolor'
+        },
+        {
+          title: '英文名',
+          dataIndex: 'departNameEn',
+          width: 140,
+          ellipsis: true,
+          className: 'replacecolor'
+        },
+         {
+          title: '缩写',
+          dataIndex: 'departNameAbbr',
+          width: 130,
+          ellipsis: true,
+          className: 'replacecolor'
+        },
+
+        {
+          title: '描述',
+          dataIndex: 'description',
+          width: 130,
+          ellipsis: true,
+          className: 'replacecolor'
+        },
+        {
+          title: '机构类别',
+          dataIndex: 'orgCategory',
+          width: 120,
+          ellipsis: true,
+          className: 'replacecolor'
+        },
+        {
+          title: '机构类型',
+          dataIndex: 'orgType',
+          width: 120,
+          ellipsis: true,
+          className: 'replacecolor'
+        },
+        {
+          title: '机构编码',
+          dataIndex: 'orgCode',
+          ellipsis: true,
+          width: 180,
+          className: 'replacecolor'
+        },
+        {
+          title: '手机号',
+          dataIndex: 'mobile',
+          width: 120,
+          ellipsis: true,
+          className: 'replacecolor'
+        },
+        ,
+        {
+          title: '状态',
+          dataIndex: 'status',
+          width: 130,
+          ellipsis: true,
+          className: 'replacecolor'
+        },
+      ],
+      departMentata: [ ], // 子表信息
+      departmentModVis: false,
+      selectedRowKeys:[],
+      selectedRows:[],
+    }
+  },
+  // 接收父组件 方法
+  props: {},
+
+  created() {  
+  },
+  methods: {
+    personLists(){
+      getClass().then(res => {
+          debugger
+                    if (res.success) {
+                        debugger
+                      this.departMentata = res.result
+                    }else{
+                       this.$message.error(res.message);
+                    }
+                })
+    },
+    close() {
+      this.$emit('close-declare')
+      this.departmentModVis = false
+      this.departMentata = []
+      this.selectedRowKeys = []
+    },
+    handleCancel() {
+      this.close()
+    },
+    onSelectChange(keys,rows){
+      this.selectedRowKeys = keys;
+      this.selectedRows = rows;
+    },
+    addSave(){
+      if(this.selectedRowKeys.length == 0){
+          this.$message.error('请勾选数据');
+        }else if(this.selectedRowKeys.length >1){
+          this.$message.error('一次只可勾选一行数据');
+        }else{
+            var data ={
+              car_arrange : this.selectedRows[0].number,
+           }
+          this.$emit('close',data)
+          this.close()
+        }
+      }
+  },
+
+  computed: {}
+}
+</script>
+<style lang="less" scoped>
+/deep/ .ant-table-thead > tr > th {
+  text-align: center;
+  // font-weight: 700;
+}
+/deep/ .ant-table-tbody {
+  text-align: center;
+}
+// th.replacecolor {
+// background-color:  #ccc;
+// }
+// 对话框里的card样式
+/deep/ .ant-modal-content {
+  background-color: #f0f2f5;
+}
+/deep/ .ant-modal-body {
+  padding: 10px;
+}
+/deep/.ant-form-item{
+  margin-bottom: 0px !important;
+}
+/deep/.ant-table-scroll {
+    word-break: break-all;
+}
+</style>

src/views/activiti/form/fixedZyModal.vue

@@ -73,7 +73,7 @@ export default {
       fixedZyColumns: [ 
         {
           title: '入库单号',
-          dataIndex: 'realname',
+          dataIndex: 'inputOrderid',
           width: 140,
           ellipsis: true,
           className: 'replacecolor'