Bladeren bron

Merge remote-tracking branch 'origin/master'

yuhan 1 jaar geleden
bovenliggende
commit
cf241142c8
21 gewijzigde bestanden met toevoegingen van 4240 en 1 verwijderingen
  1. 184 0
      src/views/module_kzks/customColumns/CustomColumnsList.vue
  2. 114 0
      src/views/module_kzks/customColumns/modules/CustomColumnsForm.vue
  3. 84 0
      src/views/module_kzks/customColumns/modules/CustomColumnsModal.Style#Drawer.vue
  4. 60 0
      src/views/module_kzks/customColumns/modules/CustomColumnsModal.vue
  5. 432 0
      src/views/module_kzks/projectCostHuiji/ProjectCostHuijiList.vue
  6. 331 0
      src/views/module_kzks/projectCostHuiji/modules/ProjectCostHuijiForm.vue
  7. 84 0
      src/views/module_kzks/projectCostHuiji/modules/ProjectCostHuijiModal.Style#Drawer.vue
  8. 60 0
      src/views/module_kzks/projectCostHuiji/modules/ProjectCostHuijiModal.vue
  9. 1 1
      src/views/module_kzks/projectImportList/modules/ProjectImportListForm.vue
  10. 411 0
      src/views/module_kzks/wzOutboundOrder/WzOutboundOrderBList.vue
  11. 297 0
      src/views/module_kzks/wzOutboundOrder/WzOutboundOrderHList.vue
  12. 304 0
      src/views/module_kzks/wzOutboundOrder/modules/WzOutboundOrderBForm.vue
  13. 84 0
      src/views/module_kzks/wzOutboundOrder/modules/WzOutboundOrderBModal.Style#Drawer.vue
  14. 60 0
      src/views/module_kzks/wzOutboundOrder/modules/WzOutboundOrderBModal.vue
  15. 209 0
      src/views/module_kzks/wzOutboundOrder/modules/WzOutboundOrderHForm.vue
  16. 84 0
      src/views/module_kzks/wzOutboundOrder/modules/WzOutboundOrderHModal.Style#Drawer.vue
  17. 60 0
      src/views/module_kzks/wzOutboundOrder/modules/WzOutboundOrderHModal.vue
  18. 708 0
      src/views/module_kzks/xmcbDetail/ComContractInfoExchangeList.vue
  19. 529 0
      src/views/module_kzks/xmcbDetail/modules/ComContractInfoExchangeForm.vue
  20. 84 0
      src/views/module_kzks/xmcbDetail/modules/ComContractInfoExchangeModal.Style#Drawer.vue
  21. 60 0
      src/views/module_kzks/xmcbDetail/modules/ComContractInfoExchangeModal.vue

+ 184 - 0
src/views/module_kzks/customColumns/CustomColumnsList.vue

@@ -0,0 +1,184 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </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>
+
+    <custom-columns-modal ref="modalForm" @ok="modalFormOk"></custom-columns-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CustomColumnsModal from './modules/CustomColumnsModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'CustomColumnsList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CustomColumnsModal
+    },
+    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: 'userName'
+          },
+          {
+            title:'自定义列位置',
+            align:"center",
+            dataIndex: 'customLocation_dictText'
+          },
+          {
+            title:'自定义列记录',
+            align:"center",
+            dataIndex: 'checkedValues'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/customColumns/customColumns/list",
+          delete: "/customColumns/customColumns/delete",
+          deleteBatch: "/customColumns/customColumns/deleteBatch",
+          exportXlsUrl: "/customColumns/customColumns/exportXls",
+          importExcelUrl: "customColumns/customColumns/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'userName',text:'登录账号',dictCode:''})
+        fieldList.push({type:'string',value:'customLocation',text:'自定义列位置',dictCode:'custom_location'})
+        fieldList.push({type:'string',value:'checkedValues',text:'自定义列记录',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

+ 114 - 0
src/views/module_kzks/customColumns/modules/CustomColumnsForm.vue

@@ -0,0 +1,114 @@
+<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="userName">
+              <a-input v-model="model.userName" placeholder="请输入登录账号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="自定义列位置" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="customLocation">
+              <j-dict-select-tag type="list" v-model="model.customLocation" dictCode="custom_location" placeholder="请选择自定义列位置" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="自定义列记录" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="checkedValues">
+              <a-input v-model="model.checkedValues" placeholder="请输入自定义列记录"  ></a-input>
+            </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: 'CustomColumnsForm',
+    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: {
+        },
+        url: {
+          add: "/customColumns/customColumns/add",
+          edit: "/customColumns/customColumns/edit",
+          queryById: "/customColumns/customColumns/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>

+ 84 - 0
src/views/module_kzks/customColumns/modules/CustomColumnsModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <custom-columns-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></custom-columns-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 CustomColumnsForm from './CustomColumnsForm'
+
+  export default {
+    name: 'CustomColumnsModal',
+    components: {
+      CustomColumnsForm
+    },
+    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>

+ 60 - 0
src/views/module_kzks/customColumns/modules/CustomColumnsModal.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="关闭">
+    <custom-columns-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></custom-columns-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CustomColumnsForm from './CustomColumnsForm'
+  export default {
+    name: 'CustomColumnsModal',
+    components: {
+      CustomColumnsForm
+    },
+    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>

+ 432 - 0
src/views/module_kzks/projectCostHuiji/ProjectCostHuijiList.vue

@@ -0,0 +1,432 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </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>
+
+    <project-cost-huiji-modal ref="modalForm" @ok="modalFormOk"></project-cost-huiji-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ProjectCostHuijiModal from './modules/ProjectCostHuijiModal'
+
+  export default {
+    name: 'ProjectCostHuijiList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      ProjectCostHuijiModal
+    },
+    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: 'taskno'
+          },
+          {
+            title:'任务名称/来自科研任务',
+            align:"center",
+            dataIndex: 'taskname'
+          },
+          {
+            title:'型号/来自科研报工',
+            align:"center",
+            dataIndex: 'xhname'
+          },
+          {
+            title:'计划完成时间(进度要求)来自科研任务',
+            align:"center",
+            dataIndex: 'jhwcsj',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
+            title:'阶段/来自科研报工',
+            align:"center",
+            dataIndex: 'yzjdname'
+          },
+          {
+            title:'项目进度/来自科研任务',
+            align:"center",
+            dataIndex: 'processpercent'
+          },
+          {
+            title:'成本进度',
+            align:"center",
+            dataIndex: 'costPercent'
+          },
+          {
+            title:'研制数量/来自科研任务',
+            align:"center",
+            dataIndex: 'yzsl'
+          },
+          {
+            title:'单台收入/(合同额or预估价)/研制数量',
+            align:"center",
+            dataIndex: 'oneIncome'
+          },
+          {
+            title:'单台成本/  总成本额/研制数量',
+            align:"center",
+            dataIndex: 'oneCost'
+          },
+          {
+            title:'单台利润/  利润额/研制数量',
+            align:"center",
+            dataIndex: 'oneProfit'
+          },
+          {
+            title:'利润额/(合同额or预估价)-总成本额',
+            align:"center",
+            dataIndex: 'lre'
+          },
+          {
+            title:'利润率/ 利润额/(合同额or预估价)*100%',
+            align:"center",
+            dataIndex: 'lrl'
+          },
+          {
+            title:'预估价/来自财务预算',
+            align:"center",
+            dataIndex: 'estimationcoat'
+          },
+          {
+            title:'合同额/来自收款合同的合同分配额 ',
+            align:"center",
+            dataIndex: 'contractfpe'
+          },
+          {
+            title:'已收款/ 来自合同收款详细的任务收款额',
+            align:"center",
+            dataIndex: 'taskmoney'
+          },
+          {
+            title:'总成本/ 直接成本+间接费用/直接成本=材料费(出库)+外协费+专用费+事务费/间接费用=工资费+管理费+燃动费+固资费',
+            align:"center",
+            dataIndex: 'zcb'
+          },
+          {
+            title:'材料费/物资出库单明细 实发主数量*采购单价',
+            align:"center",
+            dataIndex: 'clf'
+          },
+          {
+            title:'专用费',
+            align:"center",
+            dataIndex: 'zyf'
+          },
+          {
+            title:'事务费',
+            align:"center",
+            dataIndex: 'swf'
+          },
+          {
+            title:'外协费',
+            align:"center",
+            dataIndex: 'wxf'
+          },
+          {
+            title:'燃料动力费/(材料费+外协费+事务费+专用费)×1.5%',
+            align:"center",
+            dataIndex: 'rldlf'
+          },
+          {
+            title:'固定资产折旧/(材料费+外协费+事务费+专用费)×2.5%',
+            align:"center",
+            dataIndex: 'gdzczj'
+          },
+          {
+            title:'工资及劳务费/(材料费+外协费+事务费+专用费)×17%',
+            align:"center",
+            dataIndex: 'gzjlwf'
+          },
+          {
+            title:'管理费/(材料费+外协费+事务费+专用费)×5%',
+            align:"center",
+            dataIndex: 'glf'
+          },
+          {
+            title:'装机成本/ mes装机信息卡的采购单价*数量',
+            align:"center",
+            dataIndex: 'zjcb'
+          },
+          {
+            title:'内部试验',
+            align:"center",
+            dataIndex: 'lbsy'
+          },
+          {
+            title:'工时(h)/来自科研报工,每次科研报工累加计时',
+            align:"center",
+            dataIndex: 'workhour'
+          },
+          {
+            title:'责任部门/来自科研任务',
+            align:"center",
+            dataIndex: 'zrbm'
+          },
+          {
+            title:'下达部门id/来自科研任务',
+            align:"center",
+            dataIndex: 'jycsid'
+          },
+          {
+            title:'下达部门/来自科研任务',
+            align:"center",
+            dataIndex: 'jycs'
+          },
+          {
+            title:'1:横向 2:纵向/来自科研任务',
+            align:"center",
+            dataIndex: 'hxzxid'
+          },
+          {
+            title:'横向纵向/来自科研任务',
+            align:"center",
+            dataIndex: 'hxzxname'
+          },
+          {
+            title:'任务类型/来自科研任务',
+            align:"center",
+            dataIndex: 'tasktype'
+          },
+          {
+            title:'审计审价/来自科研任务',
+            align:"center",
+            dataIndex: 'auditprice'
+          },
+          {
+            title:'任务状态/来自科研任务',
+            align:"center",
+            dataIndex: 'iflag'
+          },
+          {
+            title:'提出单位简称/来自科研任务',
+            align:"center",
+            dataIndex: 'brief'
+          },
+          {
+            title:'父级任务/来自科研任务',
+            align:"center",
+            dataIndex: 'reftaskno'
+          },
+          {
+            title:'批产任务号/来自科研任务',
+            align:"center",
+            dataIndex: 'pccode'
+          },
+          {
+            title:'备产任务号/来自科研任务',
+            align:"center",
+            dataIndex: 'bccode'
+          },
+          {
+            title:'备料任务号/来自科研任务',
+            align:"center",
+            dataIndex: 'blcode'
+          },
+          {
+            title:'业务员/来自科研任务',
+            align:"center",
+            dataIndex: 'businessman'
+          },
+          {
+            title:'设计工时',
+            align:"center",
+            dataIndex: 'sjgs'
+          },
+          {
+            title:'生产工时',
+            align:"center",
+            dataIndex: 'scgs'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/projectCostHuiji/projectCostHuiji/list",
+          delete: "/projectCostHuiji/projectCostHuiji/delete",
+          deleteBatch: "/projectCostHuiji/projectCostHuiji/deleteBatch",
+          exportXlsUrl: "/projectCostHuiji/projectCostHuiji/exportXls",
+          importExcelUrl: "projectCostHuiji/projectCostHuiji/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'taskno',text:'任务号/来自科研任务',dictCode:''})
+        fieldList.push({type:'string',value:'taskname',text:'任务名称/来自科研任务',dictCode:''})
+        fieldList.push({type:'string',value:'xhname',text:'型号/来自科研报工',dictCode:''})
+        fieldList.push({type:'date',value:'jhwcsj',text:'计划完成时间(进度要求)来自科研任务'})
+        fieldList.push({type:'string',value:'yzjdname',text:'阶段/来自科研报工',dictCode:''})
+        fieldList.push({type:'string',value:'processpercent',text:'项目进度/来自科研任务',dictCode:''})
+        fieldList.push({type:'string',value:'costPercent',text:'成本进度',dictCode:''})
+        fieldList.push({type:'int',value:'yzsl',text:'研制数量/来自科研任务',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'oneIncome',text:'单台收入/(合同额or预估价)/研制数量',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'oneCost',text:'单台成本/  总成本额/研制数量',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'oneProfit',text:'单台利润/  利润额/研制数量',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'lre',text:'利润额/(合同额or预估价)-总成本额',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'lrl',text:'利润率/ 利润额/(合同额or预估价)*100%',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'estimationcoat',text:'预估价/来自财务预算',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'contractfpe',text:'合同额/来自收款合同的合同分配额 ',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'taskmoney',text:'已收款/ 来自合同收款详细的任务收款额',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'zcb',text:'总成本/ 直接成本+间接费用/直接成本=材料费(出库)+外协费+专用费+事务费/间接费用=工资费+管理费+燃动费+固资费',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'clf',text:'材料费/物资出库单明细 实发主数量*采购单价',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'zyf',text:'专用费',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'swf',text:'事务费',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'wxf',text:'外协费',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'rldlf',text:'燃料动力费/(材料费+外协费+事务费+专用费)×1.5%',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'gdzczj',text:'固定资产折旧/(材料费+外协费+事务费+专用费)×2.5%',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'gzjlwf',text:'工资及劳务费/(材料费+外协费+事务费+专用费)×17%',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'glf',text:'管理费/(材料费+外协费+事务费+专用费)×5%',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'zjcb',text:'装机成本/ mes装机信息卡的采购单价*数量',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'lbsy',text:'内部试验',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'workhour',text:'工时(h)/来自科研报工,每次科研报工累加计时',dictCode:''})
+        fieldList.push({type:'string',value:'zrbm',text:'责任部门/来自科研任务',dictCode:''})
+        fieldList.push({type:'int',value:'jycsid',text:'下达部门id/来自科研任务',dictCode:''})
+        fieldList.push({type:'string',value:'jycs',text:'下达部门/来自科研任务',dictCode:''})
+        fieldList.push({type:'int',value:'hxzxid',text:'1:横向 2:纵向/来自科研任务',dictCode:''})
+        fieldList.push({type:'string',value:'hxzxname',text:'横向纵向/来自科研任务',dictCode:''})
+        fieldList.push({type:'string',value:'tasktype',text:'任务类型/来自科研任务',dictCode:''})
+        fieldList.push({type:'string',value:'auditprice',text:'审计审价/来自科研任务',dictCode:''})
+        fieldList.push({type:'string',value:'iflag',text:'任务状态/来自科研任务',dictCode:''})
+        fieldList.push({type:'string',value:'brief',text:'提出单位简称/来自科研任务',dictCode:''})
+        fieldList.push({type:'int',value:'reftaskno',text:'父级任务/来自科研任务',dictCode:''})
+        fieldList.push({type:'int',value:'pccode',text:'批产任务号/来自科研任务',dictCode:''})
+        fieldList.push({type:'int',value:'bccode',text:'备产任务号/来自科研任务',dictCode:''})
+        fieldList.push({type:'int',value:'blcode',text:'备料任务号/来自科研任务',dictCode:''})
+        fieldList.push({type:'string',value:'businessman',text:'业务员/来自科研任务',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'sjgs',text:'设计工时',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'scgs',text:'生产工时',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

+ 331 - 0
src/views/module_kzks/projectCostHuiji/modules/ProjectCostHuijiForm.vue

@@ -0,0 +1,331 @@
+<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="taskno">
+              <a-input v-model="model.taskno" placeholder="请输入任务号/来自科研任务"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="任务名称/来自科研任务" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="taskname">
+              <a-input v-model="model.taskname" placeholder="请输入任务名称/来自科研任务"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="型号/来自科研报工" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="xhname">
+              <a-input v-model="model.xhname" placeholder="请输入型号/来自科研报工"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="计划完成时间(进度要求)来自科研任务" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="jhwcsj">
+              <j-date placeholder="请选择计划完成时间(进度要求)来自科研任务" v-model="model.jhwcsj"  style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="阶段/来自科研报工" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="yzjdname">
+              <a-input v-model="model.yzjdname" placeholder="请输入阶段/来自科研报工"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="项目进度/来自科研任务" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processpercent">
+              <a-input v-model="model.processpercent" placeholder="请输入项目进度/来自科研任务"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="成本进度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="costPercent">
+              <a-input v-model="model.costPercent" placeholder="请输入成本进度"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="研制数量/来自科研任务" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="yzsl">
+              <a-input-number v-model="model.yzsl" placeholder="请输入研制数量/来自科研任务" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="单台收入/(合同额or预估价)/研制数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="oneIncome">
+              <a-input-number v-model="model.oneIncome" placeholder="请输入单台收入/(合同额or预估价)/研制数量" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="单台成本/  总成本额/研制数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="oneCost">
+              <a-input-number v-model="model.oneCost" placeholder="请输入单台成本/  总成本额/研制数量" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="单台利润/  利润额/研制数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="oneProfit">
+              <a-input-number v-model="model.oneProfit" placeholder="请输入单台利润/  利润额/研制数量" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="利润额/(合同额or预估价)-总成本额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="lre">
+              <a-input-number v-model="model.lre" placeholder="请输入利润额/(合同额or预估价)-总成本额" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="利润率/ 利润额/(合同额or预估价)*100%" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="lrl">
+              <a-input-number v-model="model.lrl" placeholder="请输入利润率/ 利润额/(合同额or预估价)*100%" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="预估价/来自财务预算" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="estimationcoat">
+              <a-input-number v-model="model.estimationcoat" placeholder="请输入预估价/来自财务预算" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="合同额/来自收款合同的合同分配额 " :labelCol="labelCol" :wrapperCol="wrapperCol" prop="contractfpe">
+              <a-input-number v-model="model.contractfpe" placeholder="请输入合同额/来自收款合同的合同分配额 " style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="已收款/ 来自合同收款详细的任务收款额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="taskmoney">
+              <a-input-number v-model="model.taskmoney" placeholder="请输入已收款/ 来自合同收款详细的任务收款额" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="总成本/ 直接成本+间接费用/直接成本=材料费(出库)+外协费+专用费+事务费/间接费用=工资费+管理费+燃动费+固资费" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zcb">
+              <a-input-number v-model="model.zcb" placeholder="请输入总成本/ 直接成本+间接费用/直接成本=材料费(出库)+外协费+专用费+事务费/间接费用=工资费+管理费+燃动费+固资费" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="材料费/物资出库单明细 实发主数量*采购单价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clf">
+              <a-input-number v-model="model.clf" placeholder="请输入材料费/物资出库单明细 实发主数量*采购单价" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="专用费" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zyf">
+              <a-input-number v-model="model.zyf" placeholder="请输入专用费" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="事务费" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="swf">
+              <a-input-number v-model="model.swf" placeholder="请输入事务费" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="外协费" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wxf">
+              <a-input-number v-model="model.wxf" placeholder="请输入外协费" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="燃料动力费/(材料费+外协费+事务费+专用费)×1.5%" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="rldlf">
+              <a-input-number v-model="model.rldlf" placeholder="请输入燃料动力费/(材料费+外协费+事务费+专用费)×1.5%" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="固定资产折旧/(材料费+外协费+事务费+专用费)×2.5%" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="gdzczj">
+              <a-input-number v-model="model.gdzczj" placeholder="请输入固定资产折旧/(材料费+外协费+事务费+专用费)×2.5%" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="工资及劳务费/(材料费+外协费+事务费+专用费)×17%" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="gzjlwf">
+              <a-input-number v-model="model.gzjlwf" placeholder="请输入工资及劳务费/(材料费+外协费+事务费+专用费)×17%" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="管理费/(材料费+外协费+事务费+专用费)×5%" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="glf">
+              <a-input-number v-model="model.glf" placeholder="请输入管理费/(材料费+外协费+事务费+专用费)×5%" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="装机成本/ mes装机信息卡的采购单价*数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zjcb">
+              <a-input-number v-model="model.zjcb" placeholder="请输入装机成本/ mes装机信息卡的采购单价*数量" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="内部试验" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="lbsy">
+              <a-input-number v-model="model.lbsy" placeholder="请输入内部试验" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="工时(h)/来自科研报工,每次科研报工累加计时" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workhour">
+              <a-input-number v-model="model.workhour" placeholder="请输入工时(h)/来自科研报工,每次科研报工累加计时" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="责任部门/来自科研任务" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zrbm">
+              <a-input v-model="model.zrbm" placeholder="请输入责任部门/来自科研任务"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="下达部门id/来自科研任务" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="jycsid">
+              <a-input-number v-model="model.jycsid" placeholder="请输入下达部门id/来自科研任务" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="下达部门/来自科研任务" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="jycs">
+              <a-input v-model="model.jycs" placeholder="请输入下达部门/来自科研任务"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="1:横向 2:纵向/来自科研任务" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="hxzxid">
+              <a-input-number v-model="model.hxzxid" placeholder="请输入1:横向 2:纵向/来自科研任务" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="横向纵向/来自科研任务" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="hxzxname">
+              <a-input v-model="model.hxzxname" placeholder="请输入横向纵向/来自科研任务"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="任务类型/来自科研任务" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tasktype">
+              <a-input v-model="model.tasktype" placeholder="请输入任务类型/来自科研任务"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="审计审价/来自科研任务" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="auditprice">
+              <a-input v-model="model.auditprice" placeholder="请输入审计审价/来自科研任务"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="任务状态/来自科研任务" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="iflag">
+              <a-input v-model="model.iflag" placeholder="请输入任务状态/来自科研任务"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="提出单位简称/来自科研任务" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="brief">
+              <a-input v-model="model.brief" placeholder="请输入提出单位简称/来自科研任务"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="父级任务/来自科研任务" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="reftaskno">
+              <a-input-number v-model="model.reftaskno" placeholder="请输入父级任务/来自科研任务" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="批产任务号/来自科研任务" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pccode">
+              <a-input-number v-model="model.pccode" placeholder="请输入批产任务号/来自科研任务" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="备产任务号/来自科研任务" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bccode">
+              <a-input-number v-model="model.bccode" placeholder="请输入备产任务号/来自科研任务" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="备料任务号/来自科研任务" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="blcode">
+              <a-input-number v-model="model.blcode" placeholder="请输入备料任务号/来自科研任务" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="业务员/来自科研任务" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="businessman">
+              <a-input v-model="model.businessman" placeholder="请输入业务员/来自科研任务"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="设计工时" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sjgs">
+              <a-input-number v-model="model.sjgs" placeholder="请输入设计工时" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="生产工时" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="scgs">
+              <a-input-number v-model="model.scgs" placeholder="请输入生产工时" style="width: 100%" />
+            </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: 'ProjectCostHuijiForm',
+    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: {
+           xhname: [
+              { required: true, message: '请输入型号/来自科研报工!'},
+           ],
+           yzsl: [
+              { required: true, message: '请输入研制数量/来自科研任务!'},
+           ],
+           wxf: [
+              { required: true, message: '请输入外协费!'},
+           ],
+           tasktype: [
+              { required: true, message: '请输入任务类型/来自科研任务!'},
+           ],
+        },
+        url: {
+          add: "/projectCostHuiji/projectCostHuiji/add",
+          edit: "/projectCostHuiji/projectCostHuiji/edit",
+          queryById: "/projectCostHuiji/projectCostHuiji/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>

+ 84 - 0
src/views/module_kzks/projectCostHuiji/modules/ProjectCostHuijiModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <project-cost-huiji-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></project-cost-huiji-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 ProjectCostHuijiForm from './ProjectCostHuijiForm'
+
+  export default {
+    name: 'ProjectCostHuijiModal',
+    components: {
+      ProjectCostHuijiForm
+    },
+    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>

+ 60 - 0
src/views/module_kzks/projectCostHuiji/modules/ProjectCostHuijiModal.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="关闭">
+    <project-cost-huiji-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></project-cost-huiji-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import ProjectCostHuijiForm from './ProjectCostHuijiForm'
+  export default {
+    name: 'ProjectCostHuijiModal',
+    components: {
+      ProjectCostHuijiForm
+    },
+    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>

+ 1 - 1
src/views/module_kzks/projectImportList/modules/ProjectImportListForm.vue

@@ -122,7 +122,7 @@
               that.confirmLoading = false;
             })
           }
-         
+
         })
       },
     }

+ 411 - 0
src/views/module_kzks/wzOutboundOrder/WzOutboundOrderBList.vue

@@ -0,0 +1,411 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </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>
+
+    <wz-outbound-order-b-modal ref="modalForm" @ok="modalFormOk"></wz-outbound-order-b-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import WzOutboundOrderBModal from './modules/WzOutboundOrderBModal'
+
+  export default {
+    name: 'WzOutboundOrderBList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      WzOutboundOrderBModal
+    },
+    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: 'wlbm'
+          },
+          {
+            title:'物料名称',
+            align:"center",
+            dataIndex: 'wlmc'
+          },
+          {
+            title:'规格型号',
+            align:"center",
+            dataIndex: 'ggxh'
+          },
+          {
+            title:'牌号',
+            align:"center",
+            dataIndex: 'ph'
+          },
+          {
+            title:'详细技术规范',
+            align:"center",
+            dataIndex: 'xxjsgf'
+          },
+          {
+            title:'技术标准',
+            align:"center",
+            dataIndex: 'jsbz'
+          },
+          {
+            title:'质量等级',
+            align:"center",
+            dataIndex: 'zldj'
+          },
+          {
+            title:'封装形式',
+            align:"center",
+            dataIndex: 'fzxs'
+          },
+          {
+            title:'生产厂家',
+            align:"center",
+            dataIndex: 'sccj'
+          },
+          {
+            title:'国产进口',
+            align:"center",
+            dataIndex: 'gcjk'
+          },
+          {
+            title:'采购单价',
+            align:"center",
+            dataIndex: 'cgdj'
+          },
+          {
+            title:'内部单价',
+            align:"center",
+            dataIndex: 'nbdj'
+          },
+          {
+            title:'备料计划单据号',
+            align:"center",
+            dataIndex: 'bljhdjh'
+          },
+          {
+            title:'行号',
+            align:"center",
+            dataIndex: 'hh'
+          },
+          {
+            title:'出库日期',
+            align:"center",
+            dataIndex: 'ckrq'
+          },
+          {
+            title:'实发主数量',
+            align:"center",
+            dataIndex: 'sfzsl'
+          },
+          {
+            title:'应发主数量',
+            align:"center",
+            dataIndex: 'yfzsl'
+          },
+          {
+            title:'入库批次号',
+            align:"center",
+            dataIndex: 'rkpch'
+          },
+          {
+            title:'型号规格技术指标',
+            align:"center",
+            dataIndex: 'xhgljszb'
+          },
+          {
+            title:'工序单号',
+            align:"center",
+            dataIndex: 'gxdh'
+          },
+          {
+            title:'DPA号',
+            align:"center",
+            dataIndex: 'dpah'
+          },
+          {
+            title:'合格证上传情况',
+            align:"center",
+            dataIndex: 'hgzscqk'
+          },
+          {
+            title:'质保有效期',
+            align:"center",
+            dataIndex: 'zbyxq'
+          },
+          {
+            title:'外观标识',
+            align:"center",
+            dataIndex: 'wgbs'
+          },
+          {
+            title:'供应商批次号',
+            align:"center",
+            dataIndex: 'gyspch'
+          },
+          {
+            title:'库位号',
+            align:"center",
+            dataIndex: 'kwh'
+          },
+          {
+            title:'质保单位',
+            align:"center",
+            dataIndex: 'zbdw'
+          },
+          {
+            title:'质保依据',
+            align:"center",
+            dataIndex: 'zbyj'
+          },
+          {
+            title:'任务号',
+            align:"center",
+            dataIndex: 'rwh'
+          },
+          {
+            title:'元器件分类',
+            align:"center",
+            dataIndex: 'yqjfl'
+          },
+          {
+            title:'出库备注',
+            align:"center",
+            dataIndex: 'ckbz'
+          },
+          {
+            title:'出库单表头主键',
+            align:"center",
+            dataIndex: 'ckdbtzj'
+          },
+          {
+            title:'出库单表体主键',
+            align:"center",
+            dataIndex: 'ckdbtizj'
+          },
+          {
+            title:'来源单据号',
+            align:"center",
+            dataIndex: 'lydjh'
+          },
+          {
+            title:'来源单类型编码',
+            align:"center",
+            dataIndex: 'lydlxbm'
+          },
+          {
+            title:'来源交易类型主键',
+            align:"center",
+            dataIndex: 'lyjylxzj'
+          },
+          {
+            title:'件数',
+            align:"center",
+            dataIndex: 'js'
+          },
+          {
+            title:'条码',
+            align:"center",
+            dataIndex: 'tm'
+          },
+          {
+            title:'出库单号',
+            align:"center",
+            dataIndex: 'ckdh'
+          },
+          {
+            title:'复验单位',
+            align:"center",
+            dataIndex: 'fydw'
+          },
+          {
+            title:'最新时间戳',
+            align:"center",
+            dataIndex: 'zxsjc'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/wzOutboundOrder/wzOutboundOrderB/list",
+          delete: "/wzOutboundOrder/wzOutboundOrderB/delete",
+          deleteBatch: "/wzOutboundOrder/wzOutboundOrderB/deleteBatch",
+          exportXlsUrl: "/wzOutboundOrder/wzOutboundOrderB/exportXls",
+          importExcelUrl: "wzOutboundOrder/wzOutboundOrderB/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'wlbm',text:'物料编码'})
+        fieldList.push({type:'string',value:'wlmc',text:'物料名称'})
+        fieldList.push({type:'string',value:'ggxh',text:'规格型号'})
+        fieldList.push({type:'string',value:'ph',text:'牌号'})
+        fieldList.push({type:'string',value:'xxjsgf',text:'详细技术规范'})
+        fieldList.push({type:'string',value:'jsbz',text:'技术标准'})
+        fieldList.push({type:'string',value:'zldj',text:'质量等级'})
+        fieldList.push({type:'string',value:'fzxs',text:'封装形式'})
+        fieldList.push({type:'string',value:'sccj',text:'生产厂家'})
+        fieldList.push({type:'string',value:'gcjk',text:'国产进口'})
+        fieldList.push({type:'number',value:'cgdj',text:'采购单价'})
+        fieldList.push({type:'number',value:'nbdj',text:'内部单价'})
+        fieldList.push({type:'string',value:'bljhdjh',text:'备料计划单据号'})
+        fieldList.push({type:'string',value:'hh',text:'行号'})
+        fieldList.push({type:'string',value:'ckrq',text:'出库日期'})
+        fieldList.push({type:'number',value:'sfzsl',text:'实发主数量'})
+        fieldList.push({type:'number',value:'yfzsl',text:'应发主数量'})
+        fieldList.push({type:'string',value:'rkpch',text:'入库批次号'})
+        fieldList.push({type:'string',value:'xhgljszb',text:'型号规格技术指标'})
+        fieldList.push({type:'string',value:'gxdh',text:'工序单号'})
+        fieldList.push({type:'string',value:'dpah',text:'DPA号'})
+        fieldList.push({type:'string',value:'hgzscqk',text:'合格证上传情况'})
+        fieldList.push({type:'string',value:'zbyxq',text:'质保有效期'})
+        fieldList.push({type:'string',value:'wgbs',text:'外观标识'})
+        fieldList.push({type:'string',value:'gyspch',text:'供应商批次号'})
+        fieldList.push({type:'string',value:'kwh',text:'库位号'})
+        fieldList.push({type:'string',value:'zbdw',text:'质保单位'})
+        fieldList.push({type:'string',value:'zbyj',text:'质保依据'})
+        fieldList.push({type:'string',value:'rwh',text:'任务号'})
+        fieldList.push({type:'string',value:'yqjfl',text:'元器件分类'})
+        fieldList.push({type:'string',value:'ckbz',text:'出库备注'})
+        fieldList.push({type:'string',value:'ckdbtzj',text:'出库单表头主键'})
+        fieldList.push({type:'string',value:'ckdbtizj',text:'出库单表体主键'})
+        fieldList.push({type:'string',value:'lydjh',text:'来源单据号'})
+        fieldList.push({type:'string',value:'lydlxbm',text:'来源单类型编码'})
+        fieldList.push({type:'string',value:'lyjylxzj',text:'来源交易类型主键'})
+        fieldList.push({type:'string',value:'js',text:'件数'})
+        fieldList.push({type:'string',value:'tm',text:'条码'})
+        fieldList.push({type:'string',value:'ckdh',text:'出库单号'})
+        fieldList.push({type:'string',value:'fydw',text:'复验单位'})
+        fieldList.push({type:'string',value:'zxsjc',text:'最新时间戳'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

+ 297 - 0
src/views/module_kzks/wzOutboundOrder/WzOutboundOrderHList.vue

@@ -0,0 +1,297 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </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>
+
+    <wz-outbound-order-h-modal ref="modalForm" @ok="modalFormOk"></wz-outbound-order-h-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import WzOutboundOrderHModal from './modules/WzOutboundOrderHModal'
+
+  export default {
+    name: 'WzOutboundOrderHList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      WzOutboundOrderHModal
+    },
+    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: 'qzr'
+          },
+          {
+            title:'制单人',
+            align:"center",
+            dataIndex: 'zdr'
+          },
+          {
+            title:'领料员',
+            align:"center",
+            dataIndex: 'lly'
+          },
+          {
+            title:'领用部门',
+            align:"center",
+            dataIndex: 'lybm'
+          },
+          {
+            title:'仓库',
+            align:"center",
+            dataIndex: 'ck'
+          },
+          {
+            title:'库管员编码',
+            align:"center",
+            dataIndex: 'khybm'
+          },
+          {
+            title:'库管员名称',
+            align:"center",
+            dataIndex: 'kgymc'
+          },
+          {
+            title:'制单日期',
+            align:"center",
+            dataIndex: 'zdrq'
+          },
+          {
+            title:'单据状态',
+            align:"center",
+            dataIndex: 'djzt'
+          },
+          {
+            title:'总数量',
+            align:"center",
+            dataIndex: 'zsl'
+          },
+          {
+            title:'签字日期',
+            align:"center",
+            dataIndex: 'qzrq'
+          },
+          {
+            title:'出库单号',
+            align:"center",
+            dataIndex: 'ckdh'
+          },
+          {
+            title:'配套指令号',
+            align:"center",
+            dataIndex: 'ptzlh'
+          },
+          {
+            title:'任务号',
+            align:"center",
+            dataIndex: 'rwh'
+          },
+          {
+            title:'工程型号',
+            align:"center",
+            dataIndex: 'gcxh'
+          },
+          {
+            title:'质保单位',
+            align:"center",
+            dataIndex: 'zbdw'
+          },
+          {
+            title:'质保依据',
+            align:"center",
+            dataIndex: 'zbyj'
+          },
+          {
+            title:'板号',
+            align:"center",
+            dataIndex: 'bh'
+          },
+          {
+            title:'设备名称',
+            align:"center",
+            dataIndex: 'sbmc'
+          },
+          {
+            title:'任务阶段',
+            align:"center",
+            dataIndex: 'rwjd'
+          },
+          {
+            title:'打印次数',
+            align:"center",
+            dataIndex: 'dycs'
+          },
+          {
+            title:'出库单主键',
+            align:"center",
+            dataIndex: 'ckdzj'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/wzOutboundOrder/wzOutboundOrderH/list",
+          delete: "/wzOutboundOrder/wzOutboundOrderH/delete",
+          deleteBatch: "/wzOutboundOrder/wzOutboundOrderH/deleteBatch",
+          exportXlsUrl: "/wzOutboundOrder/wzOutboundOrderH/exportXls",
+          importExcelUrl: "wzOutboundOrder/wzOutboundOrderH/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'qzr',text:'签字人'})
+        fieldList.push({type:'string',value:'zdr',text:'制单人'})
+        fieldList.push({type:'string',value:'lly',text:'领料员'})
+        fieldList.push({type:'string',value:'lybm',text:'领用部门'})
+        fieldList.push({type:'string',value:'ck',text:'仓库'})
+        fieldList.push({type:'string',value:'khybm',text:'库管员编码'})
+        fieldList.push({type:'string',value:'kgymc',text:'库管员名称'})
+        fieldList.push({type:'string',value:'zdrq',text:'制单日期'})
+        fieldList.push({type:'string',value:'djzt',text:'单据状态'})
+        fieldList.push({type:'string',value:'zsl',text:'总数量'})
+        fieldList.push({type:'string',value:'qzrq',text:'签字日期'})
+        fieldList.push({type:'string',value:'ckdh',text:'出库单号'})
+        fieldList.push({type:'string',value:'ptzlh',text:'配套指令号'})
+        fieldList.push({type:'string',value:'rwh',text:'任务号'})
+        fieldList.push({type:'string',value:'gcxh',text:'工程型号'})
+        fieldList.push({type:'string',value:'zbdw',text:'质保单位'})
+        fieldList.push({type:'string',value:'zbyj',text:'质保依据'})
+        fieldList.push({type:'string',value:'bh',text:'板号'})
+        fieldList.push({type:'string',value:'sbmc',text:'设备名称'})
+        fieldList.push({type:'string',value:'rwjd',text:'任务阶段'})
+        fieldList.push({type:'string',value:'dycs',text:'打印次数'})
+        fieldList.push({type:'string',value:'ckdzj',text:'出库单主键'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

+ 304 - 0
src/views/module_kzks/wzOutboundOrder/modules/WzOutboundOrderBForm.vue

@@ -0,0 +1,304 @@
+<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="wlbm">
+              <a-input v-model="model.wlbm" placeholder="请输入物料编码"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="物料名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wlmc">
+              <a-input v-model="model.wlmc" placeholder="请输入物料名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="规格型号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ggxh">
+              <a-input v-model="model.ggxh" placeholder="请输入规格型号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="牌号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ph">
+              <a-input v-model="model.ph" placeholder="请输入牌号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="详细技术规范" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="xxjsgf">
+              <a-input v-model="model.xxjsgf" placeholder="请输入详细技术规范"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="技术标准" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="jsbz">
+              <a-input v-model="model.jsbz" placeholder="请输入技术标准"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="质量等级" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zldj">
+              <a-input v-model="model.zldj" placeholder="请输入质量等级"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="封装形式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fzxs">
+              <a-input v-model="model.fzxs" placeholder="请输入封装形式"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="生产厂家" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sccj">
+              <a-input v-model="model.sccj" placeholder="请输入生产厂家"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="国产进口" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="gcjk">
+              <a-input v-model="model.gcjk" placeholder="请输入国产进口"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="采购单价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cgdj">
+              <a-input-number v-model="model.cgdj" placeholder="请输入采购单价" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="内部单价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nbdj">
+              <a-input-number v-model="model.nbdj" placeholder="请输入内部单价" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="备料计划单据号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bljhdjh">
+              <a-input v-model="model.bljhdjh" placeholder="请输入备料计划单据号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="行号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="hh">
+              <a-input v-model="model.hh" placeholder="请输入行号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="出库日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ckrq">
+              <a-input v-model="model.ckrq" placeholder="请输入出库日期"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="实发主数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sfzsl">
+              <a-input-number v-model="model.sfzsl" placeholder="请输入实发主数量" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="应发主数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="yfzsl">
+              <a-input-number v-model="model.yfzsl" placeholder="请输入应发主数量" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="入库批次号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="rkpch">
+              <a-input v-model="model.rkpch" placeholder="请输入入库批次号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="型号规格技术指标" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="xhgljszb">
+              <a-input v-model="model.xhgljszb" placeholder="请输入型号规格技术指标"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="工序单号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="gxdh">
+              <a-input v-model="model.gxdh" placeholder="请输入工序单号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="DPA号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dpah">
+              <a-input v-model="model.dpah" placeholder="请输入DPA号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="合格证上传情况" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="hgzscqk">
+              <a-input v-model="model.hgzscqk" placeholder="请输入合格证上传情况"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="质保有效期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zbyxq">
+              <a-input v-model="model.zbyxq" placeholder="请输入质保有效期"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="外观标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wgbs">
+              <a-input v-model="model.wgbs" placeholder="请输入外观标识"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="供应商批次号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="gyspch">
+              <a-input v-model="model.gyspch" placeholder="请输入供应商批次号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="库位号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="kwh">
+              <a-input v-model="model.kwh" placeholder="请输入库位号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="质保单位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zbdw">
+              <a-input v-model="model.zbdw" placeholder="请输入质保单位"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="质保依据" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zbyj">
+              <a-input v-model="model.zbyj" placeholder="请输入质保依据"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="任务号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="rwh">
+              <a-input v-model="model.rwh" placeholder="请输入任务号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="元器件分类" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="yqjfl">
+              <a-input v-model="model.yqjfl" placeholder="请输入元器件分类"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="出库备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ckbz">
+              <a-input v-model="model.ckbz" placeholder="请输入出库备注"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="出库单表头主键" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ckdbtzj">
+              <a-input v-model="model.ckdbtzj" placeholder="请输入出库单表头主键"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="出库单表体主键" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ckdbtizj">
+              <a-input v-model="model.ckdbtizj" placeholder="请输入出库单表体主键"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="来源单据号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="lydjh">
+              <a-input v-model="model.lydjh" placeholder="请输入来源单据号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="来源单类型编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="lydlxbm">
+              <a-input v-model="model.lydlxbm" placeholder="请输入来源单类型编码"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="来源交易类型主键" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="lyjylxzj">
+              <a-input v-model="model.lyjylxzj" placeholder="请输入来源交易类型主键"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="件数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="js">
+              <a-input v-model="model.js" placeholder="请输入件数"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="条码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tm">
+              <a-input v-model="model.tm" placeholder="请输入条码"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="出库单号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ckdh">
+              <a-input v-model="model.ckdh" placeholder="请输入出库单号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="复验单位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fydw">
+              <a-input v-model="model.fydw" placeholder="请输入复验单位"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="最新时间戳" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zxsjc">
+              <a-input v-model="model.zxsjc" placeholder="请输入最新时间戳"  ></a-input>
+            </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: 'WzOutboundOrderBForm',
+    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: {
+        },
+        url: {
+          add: "/wzOutboundOrder/wzOutboundOrderB/add",
+          edit: "/wzOutboundOrder/wzOutboundOrderB/edit",
+          queryById: "/wzOutboundOrder/wzOutboundOrderB/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>

+ 84 - 0
src/views/module_kzks/wzOutboundOrder/modules/WzOutboundOrderBModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <wz-outbound-order-b-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></wz-outbound-order-b-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 WzOutboundOrderBForm from './WzOutboundOrderBForm'
+
+  export default {
+    name: 'WzOutboundOrderBModal',
+    components: {
+      WzOutboundOrderBForm
+    },
+    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>

+ 60 - 0
src/views/module_kzks/wzOutboundOrder/modules/WzOutboundOrderBModal.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="关闭">
+    <wz-outbound-order-b-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></wz-outbound-order-b-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import WzOutboundOrderBForm from './WzOutboundOrderBForm'
+  export default {
+    name: 'WzOutboundOrderBModal',
+    components: {
+      WzOutboundOrderBForm
+    },
+    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>

+ 209 - 0
src/views/module_kzks/wzOutboundOrder/modules/WzOutboundOrderHForm.vue

@@ -0,0 +1,209 @@
+<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="qzr">
+              <a-input v-model="model.qzr" placeholder="请输入签字人"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="制单人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zdr">
+              <a-input v-model="model.zdr" placeholder="请输入制单人"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="领料员" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="lly">
+              <a-input v-model="model.lly" placeholder="请输入领料员"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="领用部门" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="lybm">
+              <a-input v-model="model.lybm" placeholder="请输入领用部门"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="仓库" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ck">
+              <a-input v-model="model.ck" placeholder="请输入仓库"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="库管员编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="khybm">
+              <a-input v-model="model.khybm" placeholder="请输入库管员编码"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="库管员名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="kgymc">
+              <a-input v-model="model.kgymc" placeholder="请输入库管员名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="制单日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zdrq">
+              <a-input v-model="model.zdrq" placeholder="请输入制单日期"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="单据状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="djzt">
+              <a-input v-model="model.djzt" placeholder="请输入单据状态"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="总数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zsl">
+              <a-input v-model="model.zsl" placeholder="请输入总数量"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="签字日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="qzrq">
+              <a-input v-model="model.qzrq" placeholder="请输入签字日期"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="出库单号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ckdh">
+              <a-input v-model="model.ckdh" placeholder="请输入出库单号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="配套指令号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ptzlh">
+              <a-input v-model="model.ptzlh" placeholder="请输入配套指令号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="任务号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="rwh">
+              <a-input v-model="model.rwh" placeholder="请输入任务号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="工程型号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="gcxh">
+              <a-input v-model="model.gcxh" placeholder="请输入工程型号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="质保单位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zbdw">
+              <a-input v-model="model.zbdw" placeholder="请输入质保单位"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="质保依据" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zbyj">
+              <a-input v-model="model.zbyj" placeholder="请输入质保依据"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="板号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bh">
+              <a-input v-model="model.bh" placeholder="请输入板号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="设备名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sbmc">
+              <a-input v-model="model.sbmc" placeholder="请输入设备名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="任务阶段" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="rwjd">
+              <a-input v-model="model.rwjd" placeholder="请输入任务阶段"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="打印次数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dycs">
+              <a-input v-model="model.dycs" placeholder="请输入打印次数"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="出库单主键" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ckdzj">
+              <a-input v-model="model.ckdzj" placeholder="请输入出库单主键"  ></a-input>
+            </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: 'WzOutboundOrderHForm',
+    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: {
+        },
+        url: {
+          add: "/wzOutboundOrder/wzOutboundOrderH/add",
+          edit: "/wzOutboundOrder/wzOutboundOrderH/edit",
+          queryById: "/wzOutboundOrder/wzOutboundOrderH/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>

+ 84 - 0
src/views/module_kzks/wzOutboundOrder/modules/WzOutboundOrderHModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <wz-outbound-order-h-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></wz-outbound-order-h-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 WzOutboundOrderHForm from './WzOutboundOrderHForm'
+
+  export default {
+    name: 'WzOutboundOrderHModal',
+    components: {
+      WzOutboundOrderHForm
+    },
+    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>

+ 60 - 0
src/views/module_kzks/wzOutboundOrder/modules/WzOutboundOrderHModal.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="关闭">
+    <wz-outbound-order-h-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></wz-outbound-order-h-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import WzOutboundOrderHForm from './WzOutboundOrderHForm'
+  export default {
+    name: 'WzOutboundOrderHModal',
+    components: {
+      WzOutboundOrderHForm
+    },
+    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>

+ 708 - 0
src/views/module_kzks/xmcbDetail/ComContractInfoExchangeList.vue

@@ -0,0 +1,708 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </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>
+
+    <com-contract-info-exchange-modal ref="modalForm" @ok="modalFormOk"></com-contract-info-exchange-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ComContractInfoExchangeModal from './modules/ComContractInfoExchangeModal'
+
+  export default {
+    name: 'ComContractInfoExchangeList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      ComContractInfoExchangeModal
+    },
+    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: 'bz'
+          },
+          {
+            title:'编号.',
+            align:"center",
+            dataIndex: 'bh'
+          },
+          {
+            title:'部门(合同付款).',
+            align:"center",
+            dataIndex: 'bm'
+          },
+          {
+            title:'产品型号.',
+            align:"center",
+            dataIndex: 'cpxh'
+          },
+          {
+            title:'待付款(元).',
+            align:"center",
+            dataIndex: 'dfk'
+          },
+          {
+            title:'待开票(元).',
+            align:"center",
+            dataIndex: 'dkp'
+          },
+          {
+            title:'到款(元).',
+            align:"center",
+            dataIndex: 'dk'
+          },
+          {
+            title:'到款日期/汇票到期日期.',
+            align:"center",
+            dataIndex: 'dkhpdqrq',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
+            title:'电话.',
+            align:"center",
+            dataIndex: 'dh'
+          },
+          {
+            title:'发票编号(sn).',
+            align:"center",
+            dataIndex: 'fpbh'
+          },
+          {
+            title:'发票编码.',
+            align:"center",
+            dataIndex: 'fpbm'
+          },
+          {
+            title:'发票开具额.',
+            align:"center",
+            dataIndex: 'fpkje'
+          },
+          {
+            title:'发票类型.',
+            align:"center",
+            dataIndex: 'fplx'
+          },
+          {
+            title:'发票内容.',
+            align:"center",
+            dataIndex: 'fpnr'
+          },
+          {
+            title:'付款方名称.',
+            align:"center",
+            dataIndex: 'fkfmc'
+          },
+          {
+            title:'更新时间.',
+            align:"center",
+            dataIndex: 'gxsj',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
+            title:'归档编号.',
+            align:"center",
+            dataIndex: 'gdbh'
+          },
+          {
+            title:'归档日期.',
+            align:"center",
+            dataIndex: 'gdrq',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
+            title:'合同编号.',
+            align:"center",
+            dataIndex: 'htbh'
+          },
+          {
+            title:'合同发票接收邮箱地址.',
+            align:"center",
+            dataIndex: 'htfpjsyxdz'
+          },
+          {
+            title:'合同分配额.',
+            align:"center",
+            dataIndex: 'htfpe'
+          },
+          {
+            title:'合同金额.',
+            align:"center",
+            dataIndex: 'htje'
+          },
+          {
+            title:'合同款状态.',
+            align:"center",
+            dataIndex: 'htkzt'
+          },
+          {
+            title:'合同类型.',
+            align:"center",
+            dataIndex: 'htlx'
+          },
+          {
+            title:'合同履行情况.',
+            align:"center",
+            dataIndex: 'htlxqk'
+          },
+          {
+            title:'合同密级.',
+            align:"center",
+            dataIndex: 'htmj'
+          },
+          {
+            title:'合同名称.',
+            align:"center",
+            dataIndex: 'htmc'
+          },
+          {
+            title:'合同起草人.',
+            align:"center",
+            dataIndex: 'htqcr'
+          },
+          {
+            title:'合同签订日期.',
+            align:"center",
+            dataIndex: 'htqdrq',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
+            title:'合同任务id.',
+            align:"center",
+            dataIndex: 'htrwid'
+          },
+          {
+            title:'合同数量.',
+            align:"center",
+            dataIndex: 'htsl'
+          },
+          {
+            title:'合同页数.',
+            align:"center",
+            dataIndex: 'htys'
+          },
+          {
+            title:'合同主管部门.',
+            align:"center",
+            dataIndex: 'htzgbm'
+          },
+          {
+            title:'合同状态.',
+            align:"center",
+            dataIndex: 'htzt'
+          },
+          {
+            title:'合同状态说明.',
+            align:"center",
+            dataIndex: 'htztsm'
+          },
+          {
+            title:'甲方(付款方).',
+            align:"center",
+            dataIndex: 'jf'
+          },
+          {
+            title:'甲方简称、用户简称.',
+            align:"center",
+            dataIndex: 'jfyhjc'
+          },
+          {
+            title:'甲方签约人.',
+            align:"center",
+            dataIndex: 'jfqyr'
+          },
+          {
+            title:'阶段.',
+            align:"center",
+            dataIndex: 'jd'
+          },
+          {
+            title:'金额(元)、收款总金额、开票金额.',
+            align:"center",
+            dataIndex: 'jeskzkp'
+          },
+          {
+            title:'开户行.',
+            align:"center",
+            dataIndex: 'khx'
+          },
+          {
+            title:'开票时间.',
+            align:"center",
+            dataIndex: 'kpsj',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
+            title:'开票状态.',
+            align:"center",
+            dataIndex: 'kpzt'
+          },
+          {
+            title:'客户id.',
+            align:"center",
+            dataIndex: 'khid'
+          },
+          {
+            title:'客户流程编号.',
+            align:"center",
+            dataIndex: 'khlcbh'
+          },
+          {
+            title:'联系人(对方).',
+            align:"center",
+            dataIndex: 'lxr'
+          },
+          {
+            title:'录入人、申请人.',
+            align:"center",
+            dataIndex: 'lrsqr'
+          },
+          {
+            title:'凭证号.',
+            align:"center",
+            dataIndex: 'pzh'
+          },
+          {
+            title:'起草日期、录入日期、申请日期.',
+            align:"center",
+            dataIndex: 'qclrsqrq',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
+            title:'签署日期.',
+            align:"center",
+            dataIndex: 'qsrq',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
+            title:'确认外协.',
+            align:"center",
+            dataIndex: 'qrwx'
+          },
+          {
+            title:'任务编号.',
+            align:"center",
+            dataIndex: 'rwbh'
+          },
+          {
+            title:'任务名称.',
+            align:"center",
+            dataIndex: 'rwmc'
+          },
+          {
+            title:'任务收款金额.',
+            align:"center",
+            dataIndex: 'rwskje'
+          },
+          {
+            title:'申请人部门.',
+            align:"center",
+            dataIndex: 'sqrbm'
+          },
+          {
+            title:'收款编号(sn).',
+            align:"center",
+            dataIndex: 'skbh'
+          },
+          {
+            title:'收款科目代码.',
+            align:"center",
+            dataIndex: 'skkmdm'
+          },
+          {
+            title:'收款类型.',
+            align:"center",
+            dataIndex: 'sklx'
+          },
+          {
+            title:'数据来源:10:合同管理,20:合同任务,30:任务合同,40:合同付款,50:合同发票,60:外协合同.',
+            align:"center",
+            dataIndex: 'sjly'
+          },
+          {
+            title:'数量(合同付款).',
+            align:"center",
+            dataIndex: 'sl'
+          },
+          {
+            title:'税号.',
+            align:"center",
+            dataIndex: 'sh'
+          },
+          {
+            title:'所属型号.',
+            align:"center",
+            dataIndex: 'ssxh'
+          },
+          {
+            title:'外协单号(sn).',
+            align:"center",
+            dataIndex: 'wxdh'
+          },
+          {
+            title:'外协合同编号.',
+            align:"center",
+            dataIndex: 'wxhtbh'
+          },
+          {
+            title:'外协类型.',
+            align:"center",
+            dataIndex: 'wxlx'
+          },
+          {
+            title:'项目密级.',
+            align:"center",
+            dataIndex: 'xmmj'
+          },
+          {
+            title:'发票需求时间.',
+            align:"center",
+            dataIndex: 'fpxqsj',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
+            title:'序号.',
+            align:"center",
+            dataIndex: 'xh'
+          },
+          {
+            title:'研制部门.',
+            align:"center",
+            dataIndex: 'yzbm'
+          },
+          {
+            title:'业务员.',
+            align:"center",
+            dataIndex: 'ywy'
+          },
+          {
+            title:'业务员部门.',
+            align:"center",
+            dataIndex: 'ywybm'
+          },
+          {
+            title:'乙方(收款方).',
+            align:"center",
+            dataIndex: 'yf'
+          },
+          {
+            title:'乙方签约人.',
+            align:"center",
+            dataIndex: 'yfqyr'
+          },
+          {
+            title:'已开票(元).',
+            align:"center",
+            dataIndex: 'ykp'
+          },
+          {
+            title:'已收款.',
+            align:"center",
+            dataIndex: 'ysk'
+          },
+          {
+            title:'用户id.',
+            align:"center",
+            dataIndex: 'yhid'
+          },
+          {
+            title:'用户简称.',
+            align:"center",
+            dataIndex: 'yhjc'
+          },
+          {
+            title:'用户名称.',
+            align:"center",
+            dataIndex: 'yhmc'
+          },
+          {
+            title:'账号.',
+            align:"center",
+            dataIndex: 'zh'
+          },
+          {
+            title:'执行状态(status).',
+            align:"center",
+            dataIndex: 'zxzt'
+          },
+          {
+            title:'主管设计师.',
+            align:"center",
+            dataIndex: 'zgsjs'
+          },
+          {
+            title:'抓总部门.',
+            align:"center",
+            dataIndex: 'zzbm'
+          },
+          {
+            title:'自筹(元).',
+            align:"center",
+            dataIndex: 'zc'
+          },
+          {
+            title:'类型(无用).',
+            align:"center",
+            dataIndex: 'pici'
+          },
+          {
+            title:'作废发票申请时间',
+            align:"center",
+            dataIndex: 'sqsj',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
+            title:'作废单号',
+            align:"center",
+            dataIndex: 'zfdh'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/xmcbDetail/comContractInfoExchange/list",
+          delete: "/xmcbDetail/comContractInfoExchange/delete",
+          deleteBatch: "/xmcbDetail/comContractInfoExchange/deleteBatch",
+          exportXlsUrl: "/xmcbDetail/comContractInfoExchange/exportXls",
+          importExcelUrl: "xmcbDetail/comContractInfoExchange/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'bz',text:'备注.',dictCode:''})
+        fieldList.push({type:'string',value:'bh',text:'编号.',dictCode:''})
+        fieldList.push({type:'string',value:'bm',text:'部门(合同付款).',dictCode:''})
+        fieldList.push({type:'string',value:'cpxh',text:'产品型号.',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'dfk',text:'待付款(元).',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'dkp',text:'待开票(元).',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'dk',text:'到款(元).',dictCode:''})
+        fieldList.push({type:'date',value:'dkhpdqrq',text:'到款日期/汇票到期日期.'})
+        fieldList.push({type:'string',value:'dh',text:'电话.',dictCode:''})
+        fieldList.push({type:'string',value:'fpbh',text:'发票编号(sn).',dictCode:''})
+        fieldList.push({type:'string',value:'fpbm',text:'发票编码.',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'fpkje',text:'发票开具额.',dictCode:''})
+        fieldList.push({type:'string',value:'fplx',text:'发票类型.',dictCode:''})
+        fieldList.push({type:'string',value:'fpnr',text:'发票内容.',dictCode:''})
+        fieldList.push({type:'string',value:'fkfmc',text:'付款方名称.',dictCode:''})
+        fieldList.push({type:'date',value:'gxsj',text:'更新时间.'})
+        fieldList.push({type:'string',value:'gdbh',text:'归档编号.',dictCode:''})
+        fieldList.push({type:'date',value:'gdrq',text:'归档日期.'})
+        fieldList.push({type:'string',value:'htbh',text:'合同编号.',dictCode:''})
+        fieldList.push({type:'string',value:'htfpjsyxdz',text:'合同发票接收邮箱地址.',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'htfpe',text:'合同分配额.',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'htje',text:'合同金额.',dictCode:''})
+        fieldList.push({type:'string',value:'htkzt',text:'合同款状态.',dictCode:''})
+        fieldList.push({type:'string',value:'htlx',text:'合同类型.',dictCode:''})
+        fieldList.push({type:'string',value:'htlxqk',text:'合同履行情况.',dictCode:''})
+        fieldList.push({type:'string',value:'htmj',text:'合同密级.',dictCode:''})
+        fieldList.push({type:'string',value:'htmc',text:'合同名称.',dictCode:''})
+        fieldList.push({type:'string',value:'htqcr',text:'合同起草人.',dictCode:''})
+        fieldList.push({type:'date',value:'htqdrq',text:'合同签订日期.'})
+        fieldList.push({type:'string',value:'htrwid',text:'合同任务id.',dictCode:''})
+        fieldList.push({type:'int',value:'htsl',text:'合同数量.',dictCode:''})
+        fieldList.push({type:'int',value:'htys',text:'合同页数.',dictCode:''})
+        fieldList.push({type:'string',value:'htzgbm',text:'合同主管部门.',dictCode:''})
+        fieldList.push({type:'string',value:'htzt',text:'合同状态.',dictCode:''})
+        fieldList.push({type:'string',value:'htztsm',text:'合同状态说明.',dictCode:''})
+        fieldList.push({type:'string',value:'jf',text:'甲方(付款方).',dictCode:''})
+        fieldList.push({type:'string',value:'jfyhjc',text:'甲方简称、用户简称.',dictCode:''})
+        fieldList.push({type:'string',value:'jfqyr',text:'甲方签约人.',dictCode:''})
+        fieldList.push({type:'string',value:'jd',text:'阶段.',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'jeskzkp',text:'金额(元)、收款总金额、开票金额.',dictCode:''})
+        fieldList.push({type:'string',value:'khx',text:'开户行.',dictCode:''})
+        fieldList.push({type:'date',value:'kpsj',text:'开票时间.'})
+        fieldList.push({type:'string',value:'kpzt',text:'开票状态.',dictCode:''})
+        fieldList.push({type:'string',value:'khid',text:'客户id.',dictCode:''})
+        fieldList.push({type:'string',value:'khlcbh',text:'客户流程编号.',dictCode:''})
+        fieldList.push({type:'string',value:'lxr',text:'联系人(对方).',dictCode:''})
+        fieldList.push({type:'string',value:'lrsqr',text:'录入人、申请人.',dictCode:''})
+        fieldList.push({type:'string',value:'pzh',text:'凭证号.',dictCode:''})
+        fieldList.push({type:'date',value:'qclrsqrq',text:'起草日期、录入日期、申请日期.'})
+        fieldList.push({type:'date',value:'qsrq',text:'签署日期.'})
+        fieldList.push({type:'string',value:'qrwx',text:'确认外协.',dictCode:''})
+        fieldList.push({type:'string',value:'rwbh',text:'任务编号.',dictCode:''})
+        fieldList.push({type:'string',value:'rwmc',text:'任务名称.',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'rwskje',text:'任务收款金额.',dictCode:''})
+        fieldList.push({type:'string',value:'sqrbm',text:'申请人部门.',dictCode:''})
+        fieldList.push({type:'string',value:'skbh',text:'收款编号(sn).',dictCode:''})
+        fieldList.push({type:'string',value:'skkmdm',text:'收款科目代码.',dictCode:''})
+        fieldList.push({type:'string',value:'sklx',text:'收款类型.',dictCode:''})
+        fieldList.push({type:'int',value:'sjly',text:'数据来源:10:合同管理,20:合同任务,30:任务合同,40:合同付款,50:合同发票,60:外协合同.',dictCode:''})
+        fieldList.push({type:'int',value:'sl',text:'数量(合同付款).',dictCode:''})
+        fieldList.push({type:'string',value:'sh',text:'税号.',dictCode:''})
+        fieldList.push({type:'string',value:'ssxh',text:'所属型号.',dictCode:''})
+        fieldList.push({type:'string',value:'wxdh',text:'外协单号(sn).',dictCode:''})
+        fieldList.push({type:'string',value:'wxhtbh',text:'外协合同编号.',dictCode:''})
+        fieldList.push({type:'string',value:'wxlx',text:'外协类型.',dictCode:''})
+        fieldList.push({type:'string',value:'xmmj',text:'项目密级.',dictCode:''})
+        fieldList.push({type:'date',value:'fpxqsj',text:'发票需求时间.'})
+        fieldList.push({type:'string',value:'xh',text:'序号.',dictCode:''})
+        fieldList.push({type:'string',value:'yzbm',text:'研制部门.',dictCode:''})
+        fieldList.push({type:'string',value:'ywy',text:'业务员.',dictCode:''})
+        fieldList.push({type:'string',value:'ywybm',text:'业务员部门.',dictCode:''})
+        fieldList.push({type:'string',value:'yf',text:'乙方(收款方).',dictCode:''})
+        fieldList.push({type:'string',value:'yfqyr',text:'乙方签约人.',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'ykp',text:'已开票(元).',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'ysk',text:'已收款.',dictCode:''})
+        fieldList.push({type:'string',value:'yhid',text:'用户id.',dictCode:''})
+        fieldList.push({type:'string',value:'yhjc',text:'用户简称.',dictCode:''})
+        fieldList.push({type:'string',value:'yhmc',text:'用户名称.',dictCode:''})
+        fieldList.push({type:'string',value:'zh',text:'账号.',dictCode:''})
+        fieldList.push({type:'string',value:'zxzt',text:'执行状态(status).',dictCode:''})
+        fieldList.push({type:'string',value:'zgsjs',text:'主管设计师.',dictCode:''})
+        fieldList.push({type:'string',value:'zzbm',text:'抓总部门.',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'zc',text:'自筹(元).',dictCode:''})
+        fieldList.push({type:'string',value:'pici',text:'类型(无用).',dictCode:''})
+        fieldList.push({type:'date',value:'sqsj',text:'作废发票申请时间'})
+        fieldList.push({type:'string',value:'zfdh',text:'作废单号',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

+ 529 - 0
src/views/module_kzks/xmcbDetail/modules/ComContractInfoExchangeForm.vue

@@ -0,0 +1,529 @@
+<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="bz">
+              <a-input v-model="model.bz" placeholder="请输入备注."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="编号." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bh">
+              <a-input v-model="model.bh" placeholder="请输入编号."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="部门(合同付款)." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bm">
+              <a-input v-model="model.bm" placeholder="请输入部门(合同付款)."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="产品型号." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cpxh">
+              <a-input v-model="model.cpxh" placeholder="请输入产品型号."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="待付款(元)." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dfk">
+              <a-input-number v-model="model.dfk" placeholder="请输入待付款(元)." style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="待开票(元)." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dkp">
+              <a-input-number v-model="model.dkp" placeholder="请输入待开票(元)." style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="到款(元)." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dk">
+              <a-input-number v-model="model.dk" placeholder="请输入到款(元)." style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="到款日期/汇票到期日期." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dkhpdqrq">
+              <j-date placeholder="请选择到款日期/汇票到期日期." v-model="model.dkhpdqrq"  style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="电话." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dh">
+              <a-input v-model="model.dh" placeholder="请输入电话."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="发票编号(sn)." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fpbh">
+              <a-input v-model="model.fpbh" placeholder="请输入发票编号(sn)."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="发票编码." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fpbm">
+              <a-input v-model="model.fpbm" placeholder="请输入发票编码."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="发票开具额." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fpkje">
+              <a-input-number v-model="model.fpkje" placeholder="请输入发票开具额." style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="发票类型." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fplx">
+              <a-input v-model="model.fplx" placeholder="请输入发票类型."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="发票内容." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fpnr">
+              <a-input v-model="model.fpnr" placeholder="请输入发票内容."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="付款方名称." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fkfmc">
+              <a-input v-model="model.fkfmc" placeholder="请输入付款方名称."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="更新时间." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="gxsj">
+              <j-date placeholder="请选择更新时间." v-model="model.gxsj"  style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="归档编号." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="gdbh">
+              <a-input v-model="model.gdbh" placeholder="请输入归档编号."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="归档日期." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="gdrq">
+              <j-date placeholder="请选择归档日期." v-model="model.gdrq"  style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="合同编号." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="htbh">
+              <a-input v-model="model.htbh" placeholder="请输入合同编号."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="合同发票接收邮箱地址." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="htfpjsyxdz">
+              <a-input v-model="model.htfpjsyxdz" placeholder="请输入合同发票接收邮箱地址."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="合同分配额." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="htfpe">
+              <a-input-number v-model="model.htfpe" placeholder="请输入合同分配额." style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="合同金额." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="htje">
+              <a-input-number v-model="model.htje" placeholder="请输入合同金额." style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="合同款状态." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="htkzt">
+              <a-input v-model="model.htkzt" placeholder="请输入合同款状态."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="合同类型." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="htlx">
+              <a-input v-model="model.htlx" placeholder="请输入合同类型."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="合同履行情况." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="htlxqk">
+              <a-input v-model="model.htlxqk" placeholder="请输入合同履行情况."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="合同密级." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="htmj">
+              <a-input v-model="model.htmj" placeholder="请输入合同密级."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="合同名称." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="htmc">
+              <a-input v-model="model.htmc" placeholder="请输入合同名称."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="合同起草人." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="htqcr">
+              <a-input v-model="model.htqcr" placeholder="请输入合同起草人."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="合同签订日期." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="htqdrq">
+              <j-date placeholder="请选择合同签订日期." v-model="model.htqdrq"  style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="合同任务id." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="htrwid">
+              <a-input v-model="model.htrwid" placeholder="请输入合同任务id."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="合同数量." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="htsl">
+              <a-input-number v-model="model.htsl" placeholder="请输入合同数量." style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="合同页数." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="htys">
+              <a-input-number v-model="model.htys" placeholder="请输入合同页数." style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="合同主管部门." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="htzgbm">
+              <a-input v-model="model.htzgbm" placeholder="请输入合同主管部门."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="合同状态." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="htzt">
+              <a-input v-model="model.htzt" placeholder="请输入合同状态."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="合同状态说明." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="htztsm">
+              <a-input v-model="model.htztsm" placeholder="请输入合同状态说明."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="甲方(付款方)." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="jf">
+              <a-input v-model="model.jf" placeholder="请输入甲方(付款方)."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="甲方简称、用户简称." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="jfyhjc">
+              <a-input v-model="model.jfyhjc" placeholder="请输入甲方简称、用户简称."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="甲方签约人." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="jfqyr">
+              <a-input v-model="model.jfqyr" placeholder="请输入甲方签约人."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="阶段." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="jd">
+              <a-input v-model="model.jd" placeholder="请输入阶段."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="金额(元)、收款总金额、开票金额." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="jeskzkp">
+              <a-input-number v-model="model.jeskzkp" placeholder="请输入金额(元)、收款总金额、开票金额." style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="开户行." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="khx">
+              <a-input v-model="model.khx" placeholder="请输入开户行."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="开票时间." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="kpsj">
+              <j-date placeholder="请选择开票时间." v-model="model.kpsj"  style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="开票状态." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="kpzt">
+              <a-input v-model="model.kpzt" placeholder="请输入开票状态."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="客户id." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="khid">
+              <a-input v-model="model.khid" placeholder="请输入客户id."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="客户流程编号." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="khlcbh">
+              <a-input v-model="model.khlcbh" placeholder="请输入客户流程编号."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="联系人(对方)." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="lxr">
+              <a-input v-model="model.lxr" placeholder="请输入联系人(对方)."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="录入人、申请人." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="lrsqr">
+              <a-input v-model="model.lrsqr" placeholder="请输入录入人、申请人."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="凭证号." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pzh">
+              <a-input v-model="model.pzh" placeholder="请输入凭证号."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="起草日期、录入日期、申请日期." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="qclrsqrq">
+              <j-date placeholder="请选择起草日期、录入日期、申请日期." v-model="model.qclrsqrq"  style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="签署日期." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="qsrq">
+              <j-date placeholder="请选择签署日期." v-model="model.qsrq"  style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="确认外协." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="qrwx">
+              <a-input v-model="model.qrwx" placeholder="请输入确认外协."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="任务编号." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="rwbh">
+              <a-input v-model="model.rwbh" placeholder="请输入任务编号."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="任务名称." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="rwmc">
+              <a-input v-model="model.rwmc" placeholder="请输入任务名称."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="任务收款金额." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="rwskje">
+              <a-input-number v-model="model.rwskje" placeholder="请输入任务收款金额." style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="申请人部门." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sqrbm">
+              <a-input v-model="model.sqrbm" placeholder="请输入申请人部门."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="收款编号(sn)." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="skbh">
+              <a-input v-model="model.skbh" placeholder="请输入收款编号(sn)."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="收款科目代码." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="skkmdm">
+              <a-input v-model="model.skkmdm" placeholder="请输入收款科目代码."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="收款类型." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sklx">
+              <a-input v-model="model.sklx" placeholder="请输入收款类型."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="数据来源:10:合同管理,20:合同任务,30:任务合同,40:合同付款,50:合同发票,60:外协合同." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sjly">
+              <a-input-number v-model="model.sjly" placeholder="请输入数据来源:10:合同管理,20:合同任务,30:任务合同,40:合同付款,50:合同发票,60:外协合同." style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="数量(合同付款)." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sl">
+              <a-input-number v-model="model.sl" placeholder="请输入数量(合同付款)." style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="税号." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sh">
+              <a-input v-model="model.sh" placeholder="请输入税号."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="所属型号." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ssxh">
+              <a-input v-model="model.ssxh" placeholder="请输入所属型号."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="外协单号(sn)." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wxdh">
+              <a-input v-model="model.wxdh" placeholder="请输入外协单号(sn)."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="外协合同编号." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wxhtbh">
+              <a-input v-model="model.wxhtbh" placeholder="请输入外协合同编号."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="外协类型." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wxlx">
+              <a-input v-model="model.wxlx" placeholder="请输入外协类型."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="项目密级." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="xmmj">
+              <a-input v-model="model.xmmj" placeholder="请输入项目密级."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="发票需求时间." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fpxqsj">
+              <j-date placeholder="请选择发票需求时间." v-model="model.fpxqsj"  style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="序号." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="xh">
+              <a-input v-model="model.xh" placeholder="请输入序号."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="研制部门." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="yzbm">
+              <a-input v-model="model.yzbm" placeholder="请输入研制部门."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="业务员." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ywy">
+              <a-input v-model="model.ywy" placeholder="请输入业务员."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="业务员部门." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ywybm">
+              <a-input v-model="model.ywybm" placeholder="请输入业务员部门."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="乙方(收款方)." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="yf">
+              <a-input v-model="model.yf" placeholder="请输入乙方(收款方)."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="乙方签约人." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="yfqyr">
+              <a-input v-model="model.yfqyr" placeholder="请输入乙方签约人."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="已开票(元)." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ykp">
+              <a-input-number v-model="model.ykp" placeholder="请输入已开票(元)." style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="已收款." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ysk">
+              <a-input-number v-model="model.ysk" placeholder="请输入已收款." style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用户id." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="yhid">
+              <a-input v-model="model.yhid" placeholder="请输入用户id."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用户简称." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="yhjc">
+              <a-input v-model="model.yhjc" placeholder="请输入用户简称."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用户名称." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="yhmc">
+              <a-input v-model="model.yhmc" placeholder="请输入用户名称."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="账号." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zh">
+              <a-input v-model="model.zh" placeholder="请输入账号."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="执行状态(status)." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zxzt">
+              <a-input v-model="model.zxzt" placeholder="请输入执行状态(status)."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="主管设计师." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zgsjs">
+              <a-input v-model="model.zgsjs" placeholder="请输入主管设计师."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="抓总部门." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zzbm">
+              <a-input v-model="model.zzbm" placeholder="请输入抓总部门."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="自筹(元)." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zc">
+              <a-input-number v-model="model.zc" placeholder="请输入自筹(元)." style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="类型(无用)." :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pici">
+              <a-input v-model="model.pici" placeholder="请输入类型(无用)."  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="作废发票申请时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sqsj">
+              <j-date placeholder="请选择作废发票申请时间" v-model="model.sqsj"  style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="作废单号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zfdh">
+              <a-input v-model="model.zfdh" placeholder="请输入作废单号"  ></a-input>
+            </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: 'ComContractInfoExchangeForm',
+    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: {
+        },
+        url: {
+          add: "/xmcbDetail/comContractInfoExchange/add",
+          edit: "/xmcbDetail/comContractInfoExchange/edit",
+          queryById: "/xmcbDetail/comContractInfoExchange/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>

+ 84 - 0
src/views/module_kzks/xmcbDetail/modules/ComContractInfoExchangeModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <com-contract-info-exchange-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></com-contract-info-exchange-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 ComContractInfoExchangeForm from './ComContractInfoExchangeForm'
+
+  export default {
+    name: 'ComContractInfoExchangeModal',
+    components: {
+      ComContractInfoExchangeForm
+    },
+    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>

+ 60 - 0
src/views/module_kzks/xmcbDetail/modules/ComContractInfoExchangeModal.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="关闭">
+    <com-contract-info-exchange-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></com-contract-info-exchange-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import ComContractInfoExchangeForm from './ComContractInfoExchangeForm'
+  export default {
+    name: 'ComContractInfoExchangeModal',
+    components: {
+      ComContractInfoExchangeForm
+    },
+    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>