diff --git a/SC-web/src/views/basic/profile/index.vue b/SC-web/src/views/basic/profile/index.vue
index a5e4587a..e50d45bc 100644
--- a/SC-web/src/views/basic/profile/index.vue
+++ b/SC-web/src/views/basic/profile/index.vue
@@ -2,22 +2,19 @@
   <div class="app-container Profile-container">
     <el-tabs tab-position="left" style="height:100%" v-model="activeTab" class="profile-tabs"
       v-loading="userLoading">
-<!--
       <el-tab-pane label="个人资料" name="user">
         <UserInfo ref="user" :user='user' v-if="visible.user" @updateInfo="getInfo" />
       </el-tab-pane>
       <el-tab-pane label="修改密码" name="password">
         <Password ref="password" v-if="visible.password" />
       </el-tab-pane>
--->
       <el-tab-pane disabled name="line"></el-tab-pane>
-      <el-tab-pane disabled name="line"></el-tab-pane>
-      <el-tab-pane label="个人资料" name="user">
-        <UserInfo ref="user" :user='user' v-if="visible.user" @updateInfo="getInfo" />
-      </el-tab-pane>
-      <el-tab-pane label="修改密码" name="password">
-        <Password ref="password" v-if="visible.password" />
-      </el-tab-pane>
+<!--      <el-tab-pane label="个人资料" name="user">-->
+<!--        <UserInfo ref="user" :user='user' v-if="visible.user" @updateInfo="getInfo"/>-->
+<!--      </el-tab-pane>-->
+<!--      <el-tab-pane label="修改密码" name="password">-->
+<!--        <Password ref="password" v-if="visible.password"/>-->
+<!--      </el-tab-pane>-->
       <el-tab-pane label="我的组织" name="organize">
         <div class="JNPF-common-title mb-10">
           <h2 class="bold">我的组织
@@ -99,7 +96,7 @@
         <div class="avatar-box">
           <el-avatar :size="50" :src="define.comUrl + user.avatar" class="avatar"
             v-if="user.avatar" />
-<!--          <div class="avatar-hover">更换头像</div>-->
+          <div class="avatar-hover">更换头像</div>
         </div>
       </el-upload>
 <!--      <span class="username">{{user.realName}}</span>-->
diff --git a/SC-web/src/views/scm/basicInformation/jg_contract/Detail.vue b/SC-web/src/views/scm/basicInformation/jg_contract/Detail.vue
index 9be12853..8772fdfa 100644
--- a/SC-web/src/views/scm/basicInformation/jg_contract/Detail.vue
+++ b/SC-web/src/views/scm/basicInformation/jg_contract/Detail.vue
@@ -11,178 +11,178 @@
 <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
 <el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" >
     <template v-if="!loading">
-            <el-col :span="24" >
+            <el-col :span="24"   v-if="jnpf.hasFormP('creatorUserId')"   >
                 <el-form-item  label="创建人id"  
  prop="creatorUserId" >
                         <p>{{dataForm.creatorUserId}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="24" >
+            <el-col :span="24"   v-if="jnpf.hasFormP('creatorUserName')"   >
                 <el-form-item  label="创建人名称"  
  prop="creatorUserName" >
                         <p>{{dataForm.creatorUserName}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('contractType')"   >
                 <el-form-item  label="合同类型 "  
  prop="contractType" >
                          <p>{{ dataForm.contractType | dynamicText(contractTypeOptions) }} </p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('contractCode')"   >
                 <el-form-item  label="合同编码"  
  prop="contractCode" >
                         <p>{{dataForm.contractCode}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('contractName')"   >
                 <el-form-item  label="合同名称"  
  prop="contractName" >
                         <p>{{dataForm.contractName}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('status')"   >
                 <el-form-item  label="合同状态"  
  prop="status" >
                         <p>{{dataForm.status}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('bidOpeningDate')"   >
                 <el-form-item  label="开标日期"  
  prop="bidOpeningDate" >
                         <p>{{jnpf.dateFormat(dataForm.bidOpeningDate)}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('startDate')"   >
                 <el-form-item  label="开始日期"  
  prop="startDate" >
                         <p>{{jnpf.dateFormat(dataForm.startDate)}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('auditDate')"   >
                 <el-form-item  label="审核日期"  
  prop="auditDate" >
                         <p>{{jnpf.dateFormat(dataForm.auditDate)}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('completionDate')"   >
                 <el-form-item  label="供货完成日期"  
  prop="completionDate" >
                         <p>{{jnpf.dateFormat(dataForm.completionDate)}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('closingDate')"   >
                 <el-form-item  label="关闭日期"  
  prop="closingDate" >
                         <p>{{jnpf.dateFormat(dataForm.closingDate)}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('collectionCycle')"   >
                 <el-form-item  label="回款周期(日)"  
  prop="collectionCycle" >
                         <p>{{dataForm.collectionCycle}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('signingDate')"   >
                 <el-form-item  label="签订日期"  
  prop="signingDate" >
                         <p>{{jnpf.dateFormat(dataForm.signingDate)}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('endDate')"   >
                 <el-form-item  label="截止日期"  
  prop="endDate" >
                         <p>{{jnpf.dateFormat(dataForm.endDate)}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="供应商/客户编"  
+            <el-col :span="8"   v-if="jnpf.hasFormP('code')"   >
+                <el-form-item  label="供应商/客户id"  
  prop="code" >
                         <p>{{dataForm.code}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="供应商/客户名"  
+            <el-col :span="8"   v-if="jnpf.hasFormP('name')"   >
+                <el-form-item  label="供应商/客户id"  
  prop="name" >
                         <p>{{dataForm.name}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('contractNo')"   >
                 <el-form-item  label="对方合同号"  
  prop="contractNo" >
                         <p>{{dataForm.contractNo}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('currency')"   >
                 <el-form-item  label="币种 "  
  prop="currency" >
                         <p>{{dataForm.currency}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('num')"   >
                 <el-form-item  label="数量"  
  prop="num" >
                         <p>{{dataForm.num}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('amount')"   >
                 <el-form-item  label="金额"  
  prop="amount" >
                         <p>{{dataForm.amount}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8"   v-if="jnpf.hasFormP('organization')"   >
                 <el-form-item  label="库存组织"  
  prop="organization" >
                         <p>{{dataForm.organization}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="16" >
+            <el-col :span="16"   v-if="jnpf.hasFormP('remark')"   >
                 <el-form-item  label="备注"  
  prop="remark" >
                         <p>{{dataForm.remark}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="24" >
+            <el-col :span="24"   v-if="jnpf.hasFormP('classification')"   >
                 <el-form-item  label="合同分类 "  
  prop="classification" >
                         <p>{{dataForm.classification}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="24" >
+            <el-col :span="24"   v-if="jnpf.hasFormP('declarationDate')"   >
                 <el-form-item  label="申报日期"  
  prop="declarationDate" >
                         <p>{{dataForm.declarationDate}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="24" >
+            <el-col :span="24"   v-if="jnpf.hasFormP('deptCode')"   >
                 <el-form-item  label="部门编码"  
  prop="deptCode" >
                         <p>{{dataForm.deptCode}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="24" >
+            <el-col :span="24"   v-if="jnpf.hasFormP('creatorusername')"   >
                 <el-form-item  label="录入人"  
  prop="creatorusername" >
                         <p>{{dataForm.creatorusername}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="24" >
+            <el-col :span="24"   v-if="jnpf.hasFormP('deptName')"   >
                 <el-form-item  label="部门名称"  
  prop="deptName" >
                         <p>{{dataForm.deptName}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="24" >
+            <el-col :span="24"   v-if="jnpf.hasFormP('approval')"   >
                 <el-form-item  label="集团审批"  
  prop="approval" >
                         <p>{{dataForm.approval}}</p>
                 </el-form-item>
             </el-col>
             <el-col :span="24">
-                <el-tabs  v-model="activenydeop"  tab-position="top" class="mb-20">
+                <el-tabs  v-model="activeayhzdd"  tab-position="top" class="mb-20">
                 <el-tab-pane  label="物料明细">
-    <el-col :span="24"  >
+    <el-col :span="24"   v-if="jnpf.hasFormP('jg_contract_item0List')" >
     <el-form-item label-width="0">
             <div class="JNPF-common-title">
                 <h2></h2>
@@ -249,7 +249,7 @@
     </el-col>
             </el-tab-pane >
                 <el-tab-pane  label="附件详情">
-    <el-col :span="24"  >
+    <el-col :span="24"   v-if="jnpf.hasFormP('jg_contract_item1List')" >
     <el-form-item label-width="0">
             <div class="JNPF-common-title">
                 <h2></h2>
@@ -305,8 +305,8 @@
                             collectionCycle : '',
                             signingDate : '',
                             endDate : '',
-                            code : '',
-                            name : '',
+                            code : "",
+                            name : "",
                             contractNo : '',
                             currency : '',
                             num : '',
@@ -322,7 +322,7 @@
                         jg_contract_item0List:[],
                         jg_contract_item1List:[],
             },
-                            activenydeop:'0',
+                            activeayhzdd:'0',
                                 contractTypeOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
 
         }
diff --git a/SC-web/src/views/scm/basicInformation/jg_contract/Form.vue b/SC-web/src/views/scm/basicInformation/jg_contract/Form.vue
index bd718c55..e60ee504 100644
--- a/SC-web/src/views/scm/basicInformation/jg_contract/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/jg_contract/Form.vue
@@ -1,643 +1,673 @@
 <template>
-<transition name="el-zoom-in-center">
-<div class="JNPF-preview-main">
-    <div class="JNPF-common-page-header">
+  <transition name="el-zoom-in-center">
+    <div class="JNPF-preview-main">
+      <div class="JNPF-common-page-header">
         <el-page-header @back="goBack"
                         :content="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'"/>
         <div class="options">
-            <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 保 存</el-button>
-            <el-button @click="goBack"> 取 消</el-button>
+          <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 保 存</el-button>
+          <el-button @click="goBack"> 取 消</el-button>
         </div>
-    </div>
-<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
-<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
-    <template v-if="!loading">
-            <el-col :span="24" >
-                <el-form-item  label="创建人id"
- prop="creatorUserId" >
-                    <el-input    v-model="dataForm.creatorUserId"
- placeholder="系统自动生成"  readonly >
+      </div>
+      <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
+        <el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right">
+          <template v-if="!loading">
+            <el-col :span="24" v-if="jnpf.hasFormP('creatorUserId')">
+              <el-form-item label="创建人id"
+                            prop="creatorUserId">
+                <el-input v-model="dataForm.creatorUserId"
+                          placeholder="系统自动生成" readonly>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="创建人名称"
- prop="creatorUserName" >
-                    <el-input    v-model="dataForm.creatorUserName"
- placeholder="系统自动生成"  readonly >
+            <el-col :span="24" v-if="jnpf.hasFormP('creatorUserName')">
+              <el-form-item label="创建人名称"
+                            prop="creatorUserName">
+                <el-input v-model="dataForm.creatorUserName"
+                          placeholder="系统自动生成" readonly>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="合同类型 "
- prop="contractType" >
-                    <el-select    v-model="dataForm.contractType"
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in contractTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+            <el-col :span="8" v-if="jnpf.hasFormP('contractType')">
+              <el-form-item label="合同类型 "
+                            prop="contractType">
+                <el-select v-model="dataForm.contractType"
+                           placeholder="请选择" clearable :style='{"width":"100%"}'>
+                  <el-option v-for="(item, index) in contractTypeOptions" :key="index" :label="item.fullName"
+                             :value="item.id" :disabled="item.disabled"></el-option>
 
                 </el-select>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="合同编码"
- prop="contractCode" >
-                    <el-input    v-model="dataForm.contractCode"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="8" v-if="jnpf.hasFormP('contractCode')">
+              <el-form-item label="合同编码"
+                            prop="contractCode">
+                <el-input v-model="dataForm.contractCode"
+                          placeholder="请输入" clearable :style='{"width":"100%"}'>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="合同名称"
- prop="contractName" >
-                    <el-input    v-model="dataForm.contractName"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="8" v-if="jnpf.hasFormP('contractName')">
+              <el-form-item label="合同名称"
+                            prop="contractName">
+                <el-input v-model="dataForm.contractName"
+                          placeholder="请输入" clearable :style='{"width":"100%"}'>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="合同状态"
- prop="status" >
-                    <el-input    v-model="dataForm.status"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="8" v-if="jnpf.hasFormP('status')">
+              <el-form-item label="合同状态"
+                            prop="status">
+                <el-input v-model="dataForm.status"
+                          placeholder="请输入" clearable :style='{"width":"100%"}'>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="开标日期"
- prop="bidOpeningDate" >
-                    <el-date-picker    v-model="dataForm.bidOpeningDate"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" >
+            <el-col :span="8" v-if="jnpf.hasFormP('bidOpeningDate')">
+              <el-form-item label="开标日期"
+                            prop="bidOpeningDate">
+                <el-date-picker v-model="dataForm.bidOpeningDate"
+                                placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
+                                value-format="timestamp">
 
                 </el-date-picker>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="开始日期"
- prop="startDate" >
-                    <el-date-picker    v-model="dataForm.startDate"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" >
+            <el-col :span="8" v-if="jnpf.hasFormP('startDate')">
+              <el-form-item label="开始日期"
+                            prop="startDate">
+                <el-date-picker v-model="dataForm.startDate"
+                                placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
+                                value-format="timestamp">
 
                 </el-date-picker>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="审核日期"
- prop="auditDate" >
-                    <el-date-picker    v-model="dataForm.auditDate"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" >
+            <el-col :span="8" v-if="jnpf.hasFormP('auditDate')">
+              <el-form-item label="审核日期"
+                            prop="auditDate">
+                <el-date-picker v-model="dataForm.auditDate"
+                                placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
+                                value-format="timestamp">
 
                 </el-date-picker>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="供货完成日期"
- prop="completionDate" >
-                    <el-date-picker    v-model="dataForm.completionDate"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" >
+            <el-col :span="8" v-if="jnpf.hasFormP('completionDate')">
+              <el-form-item label="供货完成日期"
+                            prop="completionDate">
+                <el-date-picker v-model="dataForm.completionDate"
+                                placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
+                                value-format="timestamp">
 
                 </el-date-picker>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="关闭日期"
- prop="closingDate" >
-                    <el-date-picker    v-model="dataForm.closingDate"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" >
+            <el-col :span="8" v-if="jnpf.hasFormP('closingDate')">
+              <el-form-item label="关闭日期"
+                            prop="closingDate">
+                <el-date-picker v-model="dataForm.closingDate"
+                                placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
+                                value-format="timestamp">
 
                 </el-date-picker>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="回款周期(日)"
- prop="collectionCycle" >
-                    <el-input    v-model="dataForm.collectionCycle"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="8" v-if="jnpf.hasFormP('collectionCycle')">
+              <el-form-item label="回款周期(日)"
+                            prop="collectionCycle">
+                <el-input v-model="dataForm.collectionCycle"
+                          placeholder="请输入" clearable :style='{"width":"100%"}'>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="签订日期"
- prop="signingDate" >
-                    <el-date-picker    v-model="dataForm.signingDate"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" >
+            <el-col :span="8" v-if="jnpf.hasFormP('signingDate')">
+              <el-form-item label="签订日期"
+                            prop="signingDate">
+                <el-date-picker v-model="dataForm.signingDate"
+                                placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
+                                value-format="timestamp">
 
                 </el-date-picker>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="截止日期"
- prop="endDate" >
-                    <el-date-picker    v-model="dataForm.endDate"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" >
+            <el-col :span="8" v-if="jnpf.hasFormP('endDate')">
+              <el-form-item label="截止日期"
+                            prop="endDate">
+                <el-date-picker v-model="dataForm.endDate"
+                                placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
+                                value-format="timestamp">
 
                 </el-date-picker>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="供应商/客户编"
- prop="code" >
-                    <el-input    v-model="dataForm.code"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="8" v-if="jnpf.hasFormP('code')">
+              <el-form-item label="供应商/客户id"
+                            prop="code">
+                <popupSelect v-model="dataForm.code"
+                             placeholder="请选择" clearable field="code" interfaceId="382494924156735557"
+                             :columnOptions="codecolumnOptions" propsValue="id" relationField="fullName"
+                             popupType="dialog"
+                             popupTitle="选择供应商" popupWidth="800px"
+                >
 
-                </el-input>
-                </el-form-item>
+                </popupSelect>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="供应商/客户名"
- prop="name" >
-                    <el-input    v-model="dataForm.name"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="8" v-if="jnpf.hasFormP('name')">
+              <el-form-item label="供应商/客户id"
+                            prop="name">
+                <popupSelect v-model="dataForm.name"
+                             placeholder="请选择" clearable field="name" interfaceId="395936123471343749"
+                             :columnOptions="namecolumnOptions" propsValue="id" relationField="fullName"
+                             popupType="dialog"
+                             popupTitle="选择客户" popupWidth="800px"
+                >
 
-                </el-input>
-                </el-form-item>
+                </popupSelect>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="对方合同号"
- prop="contractNo" >
-                    <el-input    v-model="dataForm.contractNo"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="8" v-if="jnpf.hasFormP('contractNo')">
+              <el-form-item label="对方合同号"
+                            prop="contractNo">
+                <el-input v-model="dataForm.contractNo"
+                          placeholder="请输入" clearable :style='{"width":"100%"}'>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="币种 "
- prop="currency" >
-                    <el-input    v-model="dataForm.currency"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="8" v-if="jnpf.hasFormP('currency')">
+              <el-form-item label="币种 "
+                            prop="currency">
+                <el-input v-model="dataForm.currency"
+                          placeholder="请输入" clearable :style='{"width":"100%"}'>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="数量"
- prop="num" >
-                    <el-input    v-model="dataForm.num"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="8" v-if="jnpf.hasFormP('num')">
+              <el-form-item label="数量"
+                            prop="num">
+                <el-input v-model="dataForm.num"
+                          placeholder="请输入" clearable :style='{"width":"100%"}'>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="金额"
- prop="amount" >
-                    <el-input    v-model="dataForm.amount"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="8" v-if="jnpf.hasFormP('amount')">
+              <el-form-item label="金额"
+                            prop="amount">
+                <el-input v-model="dataForm.amount"
+                          placeholder="请输入" clearable :style='{"width":"100%"}'>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="库存组织"
- prop="organization" >
-                    <el-input    v-model="dataForm.organization"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="8" v-if="jnpf.hasFormP('organization')">
+              <el-form-item label="库存组织"
+                            prop="organization">
+                <el-input v-model="dataForm.organization"
+                          placeholder="请输入" clearable :style='{"width":"100%"}'>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="16" >
-                <el-form-item  label="备注"
- prop="remark" >
-                    <el-input    v-model="dataForm.remark"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="16" v-if="jnpf.hasFormP('remark')">
+              <el-form-item label="备注"
+                            prop="remark">
+                <el-input v-model="dataForm.remark"
+                          placeholder="请输入" clearable :style='{"width":"100%"}'>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="合同分类 "
- prop="classification" >
-                    <el-input    v-model="dataForm.classification"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="24" v-if="jnpf.hasFormP('classification')">
+              <el-form-item label="合同分类 "
+                            prop="classification">
+                <el-input v-model="dataForm.classification"
+                          placeholder="请输入" clearable :style='{"width":"100%"}'>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="申报日期"
- prop="declarationDate" >
-                    <el-input    v-model="dataForm.declarationDate"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="24" v-if="jnpf.hasFormP('declarationDate')">
+              <el-form-item label="申报日期"
+                            prop="declarationDate">
+                <el-input v-model="dataForm.declarationDate"
+                          placeholder="请输入" clearable :style='{"width":"100%"}'>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="部门编码"
- prop="deptCode" >
-                    <el-input    v-model="dataForm.deptCode"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="24" v-if="jnpf.hasFormP('deptCode')">
+              <el-form-item label="部门编码"
+                            prop="deptCode">
+                <el-input v-model="dataForm.deptCode"
+                          placeholder="请输入" clearable :style='{"width":"100%"}'>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="录入人"
- prop="creatorusername" >
-                    <el-input    v-model="dataForm.creatorusername"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="24" v-if="jnpf.hasFormP('creatorusername')">
+              <el-form-item label="录入人"
+                            prop="creatorusername">
+                <el-input v-model="dataForm.creatorusername"
+                          placeholder="请输入" clearable :style='{"width":"100%"}'>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="部门名称"
- prop="deptName" >
-                    <el-input    v-model="dataForm.deptName"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="24" v-if="jnpf.hasFormP('deptName')">
+              <el-form-item label="部门名称"
+                            prop="deptName">
+                <el-input v-model="dataForm.deptName"
+                          placeholder="请输入" clearable :style='{"width":"100%"}'>
 
                 </el-input>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="集团审批"
- prop="approval" >
-                    <el-switch    v-model="dataForm.approval"
- :active-value="1"  :inactive-value="0" >
+            <el-col :span="24" v-if="jnpf.hasFormP('approval')">
+              <el-form-item label="集团审批"
+                            prop="approval">
+                <el-switch v-model="dataForm.approval"
+                           :active-value="1" :inactive-value="0">
 
                 </el-switch>
-                </el-form-item>
+              </el-form-item>
             </el-col>
             <el-col :span="24">
-                <el-tabs  v-model="activenydeop"  tab-position="top" class="mb-20">
-                <el-tab-pane  label="物料明细">
-    <el-col :span="24"  >
-    <el-form-item label-width="0">
-            <div class="JNPF-common-title">
-                <h2></h2>
-            </div>
-    <el-table :data="dataForm.jg_contract_item0List" size='mini'   >
-        <el-table-column type="index" width="50" label="序号" align="center" />
-            <el-table-column prop="materialCode" label="物料编码">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.materialCode"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="materialName" label="物料名称">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.materialName"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="specification" label="规格型号">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.specification"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="unit" label="单位 ">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.unit"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="num" label="数量">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.num"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="price" label="单价">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.price"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="amount" label="金额">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.amount"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="rate" label="税率 ">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.rate"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="notPrice" label="不含税单价">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.notPrice"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="notAmount" label="不含税金额">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.notAmount"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="remark" label="备注">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.remark"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-    <el-table-column label="操作" width="50" >
-        <template slot-scope="scope">
-            <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="deljg_contract_item0List(scope.$index)">删除</el-button>
-        </template>
-    </el-table-column>
-    </el-table>
-    <div class="table-actions" @click="addjg_contract_item0List()">
-        <el-button type="text" icon="el-icon-plus">添加</el-button>
-    </div>
-    </el-form-item>
-    </el-col>
-            </el-tab-pane >
-                <el-tab-pane  label="附件详情">
-    <el-col :span="24"  >
-    <el-form-item label-width="0">
-            <div class="JNPF-common-title">
-                <h2></h2>
-            </div>
-    <el-table :data="dataForm.jg_contract_item1List" size='mini'   >
-        <el-table-column type="index" width="50" label="序号" align="center" />
-            <el-table-column prop="enclosure" label="附件内容">
-                <template slot-scope="scope">
-                    <JNPF-UploadFz   v-model="scope.row.enclosure"
- :fileSize="5"    sizeUnit="MB"  :limit="9"  buttonText="点击上传" >
-                </JNPF-UploadFz>
-            </template>
-        </el-table-column>
-    <el-table-column label="操作" width="50" >
-        <template slot-scope="scope">
-            <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="deljg_contract_item1List(scope.$index)">删除</el-button>
-        </template>
-    </el-table-column>
-    </el-table>
-    <div class="table-actions" @click="addjg_contract_item1List()">
-        <el-button type="text" icon="el-icon-plus">添加</el-button>
-    </div>
-    </el-form-item>
-    </el-col>
-            </el-tab-pane >
-            </el-tabs>
-                </el-col>
-    </template>
-</el-form>
-    </el-row>
+              <el-tabs v-model="activeayhzdd" tab-position="top" class="mb-20">
+                <el-tab-pane label="物料明细">
+                  <el-col :span="24" v-if="jnpf.hasFormP('jg_contract_item0List')">
+                    <el-form-item label-width="0">
+                      <div class="JNPF-common-title">
+                        <h2></h2>
+                      </div>
+                      <el-table :data="dataForm.jg_contract_item0List" size='mini'>
+                        <el-table-column type="index" width="50" label="序号" align="center"/>
+                        <el-table-column prop="materialCode" label="物料编码">
+                          <template slot-scope="scope">
+                            <el-input v-model="scope.row.materialCode"
+                                      placeholder="请输入" clearable :style='{"width":"100%"}'>
+                            </el-input>
+                          </template>
+                        </el-table-column>
+                        <el-table-column prop="materialName" label="物料名称">
+                          <template slot-scope="scope">
+                            <el-input v-model="scope.row.materialName"
+                                      placeholder="请输入" clearable :style='{"width":"100%"}'>
+                            </el-input>
+                          </template>
+                        </el-table-column>
+                        <el-table-column prop="specification" label="规格型号">
+                          <template slot-scope="scope">
+                            <el-input v-model="scope.row.specification"
+                                      placeholder="请输入" clearable :style='{"width":"100%"}'>
+                            </el-input>
+                          </template>
+                        </el-table-column>
+                        <el-table-column prop="unit" label="单位 ">
+                          <template slot-scope="scope">
+                            <el-input v-model="scope.row.unit"
+                                      placeholder="请输入" clearable :style='{"width":"100%"}'>
+                            </el-input>
+                          </template>
+                        </el-table-column>
+                        <el-table-column prop="num" label="数量">
+                          <template slot-scope="scope">
+                            <el-input v-model="scope.row.num"
+                                      placeholder="请输入" clearable :style='{"width":"100%"}'>
+                            </el-input>
+                          </template>
+                        </el-table-column>
+                        <el-table-column prop="price" label="单价">
+                          <template slot-scope="scope">
+                            <el-input v-model="scope.row.price"
+                                      placeholder="请输入" clearable :style='{"width":"100%"}'>
+                            </el-input>
+                          </template>
+                        </el-table-column>
+                        <el-table-column prop="amount" label="金额">
+                          <template slot-scope="scope">
+                            <el-input v-model="scope.row.amount"
+                                      placeholder="请输入" clearable :style='{"width":"100%"}'>
+                            </el-input>
+                          </template>
+                        </el-table-column>
+                        <el-table-column prop="rate" label="税率 ">
+                          <template slot-scope="scope">
+                            <el-input v-model="scope.row.rate"
+                                      placeholder="请输入" clearable :style='{"width":"100%"}'>
+                            </el-input>
+                          </template>
+                        </el-table-column>
+                        <el-table-column prop="notPrice" label="不含税单价">
+                          <template slot-scope="scope">
+                            <el-input v-model="scope.row.notPrice"
+                                      placeholder="请输入" clearable :style='{"width":"100%"}'>
+                            </el-input>
+                          </template>
+                        </el-table-column>
+                        <el-table-column prop="notAmount" label="不含税金额">
+                          <template slot-scope="scope">
+                            <el-input v-model="scope.row.notAmount"
+                                      placeholder="请输入" clearable :style='{"width":"100%"}'>
+                            </el-input>
+                          </template>
+                        </el-table-column>
+                        <el-table-column prop="remark" label="备注">
+                          <template slot-scope="scope">
+                            <el-input v-model="scope.row.remark"
+                                      placeholder="请输入" clearable :style='{"width":"100%"}'>
+                            </el-input>
+                          </template>
+                        </el-table-column>
+                        <el-table-column label="操作" width="50">
+                          <template slot-scope="scope">
+                            <el-button size="mini" type="text" class="JNPF-table-delBtn"
+                                       @click="deljg_contract_item0List(scope.$index)">删除
+                            </el-button>
+                          </template>
+                        </el-table-column>
+                      </el-table>
+                      <div class="table-actions" @click="addjg_contract_item0List()">
+                        <el-button type="text" icon="el-icon-plus">添加</el-button>
+                      </div>
+                    </el-form-item>
+                  </el-col>
+                </el-tab-pane>
+                <el-tab-pane label="附件详情">
+                  <el-col :span="24" v-if="jnpf.hasFormP('jg_contract_item1List')">
+                    <el-form-item label-width="0">
+                      <div class="JNPF-common-title">
+                        <h2></h2>
+                      </div>
+                      <el-table :data="dataForm.jg_contract_item1List" size='mini'>
+                        <el-table-column type="index" width="50" label="序号" align="center"/>
+                        <el-table-column prop="enclosure" label="附件内容">
+                          <template slot-scope="scope">
+                            <JNPF-UploadFz v-model="scope.row.enclosure"
+                                           :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传">
+                            </JNPF-UploadFz>
+                          </template>
+                        </el-table-column>
+                        <el-table-column label="操作" width="50">
+                          <template slot-scope="scope">
+                            <el-button size="mini" type="text" class="JNPF-table-delBtn"
+                                       @click="deljg_contract_item1List(scope.$index)">删除
+                            </el-button>
+                          </template>
+                        </el-table-column>
+                      </el-table>
+                      <div class="table-actions" @click="addjg_contract_item1List()">
+                        <el-button type="text" icon="el-icon-plus">添加</el-button>
+                      </div>
+                    </el-form-item>
+                  </el-col>
+                </el-tab-pane>
+              </el-tabs>
+            </el-col>
+          </template>
+        </el-form>
+      </el-row>
     </div>
-</transition>
+  </transition>
 </template>
 <script>
-    import request from '@/utils/request'
-    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    export default {
-        components: {},
-        props: [],
-        data() {
-            return {
-                visible: false,
-                loading: false,
-                isDetail: false,
-            dataForm: {
-                            creatorUserId : "",
-                            creatorUserName : "",
-                            contractType : "",
-                            contractCode : '',
-                            contractName : '',
-                            status : '',
-                            bidOpeningDate : '',
-                            startDate : '',
-                            auditDate : '',
-                            completionDate : '',
-                            closingDate : '',
-                            collectionCycle : '',
-                            signingDate : '',
-                            endDate : '',
-                            code : '',
-                            name : '',
-                            contractNo : '',
-                            currency : '',
-                            num : '',
-                            amount : '',
-                            organization : '',
-                            remark : '',
-                            classification : '',
-                            declarationDate : '',
-                            deptCode : '',
-                            creatorusername : '',
-                            deptName : '',
-                            approval : 0,
-                        jg_contract_item0List:[],
-                        jg_contract_item1List:[],
-            },
-                            activenydeop:'0',
-            rules:
-            {
-                            contractType: [
-                                {
-                                    required: true,
-                                    message: '请选择',
-                                    trigger: 'change'
-                                },
-                        ],
-                            contractCode: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                                        {
-                                            pattern: '',
-                                            message: '',
-                                            trigger: 'blur'
-                                        },
-                        ],
-                            contractName: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            bidOpeningDate: [
-                                {
-                                    required: true,
-                                    message: '请选择',
-                                    trigger: 'change'
-                                },
-                        ],
-            },
-                        contractTypeOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
+  import request from '@/utils/request'
+  import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
+  import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
 
-        }
-        },
-        computed: {},
-        watch: {},
-        created() {
-        },
-        mounted() {},
-        methods: {
-				jg_contract_item0Exist() {
-				let isOk = true;
-					for(let i=0;i<this.dataForm.jg_contract_item0List.length;i++){
-						const e = this.dataForm.jg_contract_item0List[i];
-					}
-				return isOk;
-			},
-				jg_contract_item1Exist() {
-				let isOk = true;
-					for(let i=0;i<this.dataForm.jg_contract_item1List.length;i++){
-						const e = this.dataForm.jg_contract_item1List[i];
-					}
-				return isOk;
-			},
-                goBack() {
-                    this.$emit('refresh')
-                },
-            clearData(data){
-                for (let key in data) {
-                    if (data[key] instanceof Array) {
-                        data[key] = [];
-                    } else if (data[key] instanceof Object) {
-                        this.clearData(data[key]);
-                    } else {
-                        data[key] = "";
-                    }
-                }
-            },
-            init(id, isDetail) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.isDetail = isDetail || false;
-                this.$nextTick(() => {
-                    this.$refs['elForm'].resetFields();
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/example/Jg_contract/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        });
-                    }else{
-                       this.clearData(this.dataForm)
-                    }
-                });
-                this.$store.commit('generator/UPDATE_RELATION_DATA', {})
-            },
-            // 表单提交
-            dataFormSubmit() {
-                this.$refs['elForm'].validate((valid) => {
-                    if (valid) {
-                            if (!this.jg_contract_item0Exist()) return
-                            if (!this.jg_contract_item1Exist()) return
-                            this.request()
-                    }
-                })
-            },
-            request() {
-                var _data =this.dataList()
-                if (!this.dataForm.id) {
-                    request({
-                        url: '/api/example/Jg_contract',
-                        method: 'post',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    })
-                }else{
-                    request({
-                        url: '/api/example/Jg_contract/'+this.dataForm.id,
-                        method: 'PUT',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    })
-                }
-            },
-                addjg_contract_item0List(){
-                    let item = {
-                            materialCode:undefined,
-                            materialName:undefined,
-                            specification:undefined,
-                            unit:undefined,
-                            num:undefined,
-                            price:undefined,
-                            amount:undefined,
-                            rate:undefined,
-                            notPrice:undefined,
-                            notAmount:undefined,
-                            remark:undefined,
-                }
-                    this.dataForm.jg_contract_item0List.push(item)
-                },
-                deljg_contract_item0List(index) {
-                    this.dataForm.jg_contract_item0List.splice(index, 1);
-                },
-                addjg_contract_item1List(){
-                    let item = {
-                            enclosure:undefined,
-                }
-                    this.dataForm.jg_contract_item1List.push(item)
-                },
-                deljg_contract_item1List(index) {
-                    this.dataForm.jg_contract_item1List.splice(index, 1);
-                },
-            dataList(){
-                var _data = JSON.parse(JSON.stringify(this.dataForm));
-                        _data.approval = parseInt(_data.approval)
-                    for(let i=0;i<_data.jg_contract_item0List.length;i++){
-                        var _list = _data.jg_contract_item0List[i];
-                    }
-                    for(let i=0;i<_data.jg_contract_item1List.length;i++){
-                        var _list = _data.jg_contract_item1List[i];
-                                _list.enclosure = JSON.stringify(_list.enclosure)
-                    }
-                return _data;
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                        _dataAll.approval = parseInt( _dataAll.approval)
-                    for(let i=0;i<_dataAll.jg_contract_item0List.length;i++){
-                        var _list = _dataAll.jg_contract_item0List[i];
-                    }
-                    for(let i=0;i<_dataAll.jg_contract_item1List.length;i++){
-                        var _list = _dataAll.jg_contract_item1List[i];
-                                _list.enclosure = JSON.parse(_list.enclosure)
-                    }
-                this.dataForm = _dataAll
-            },
+  export default {
+    components: {},
+    props: [],
+    data() {
+      return {
+        visible: false,
+        loading: false,
+        isDetail: false,
+        dataForm: {
+          creatorUserId: "",
+          creatorUserName: "",
+          contractType: "",
+          contractCode: '',
+          contractName: '',
+          status: '',
+          bidOpeningDate: '',
+          startDate: '',
+          auditDate: '',
+          completionDate: '',
+          closingDate: '',
+          collectionCycle: '',
+          signingDate: '',
+          endDate: '',
+          code: "",
+          name: "",
+          contractNo: '',
+          currency: '',
+          num: '',
+          amount: '',
+          organization: '',
+          remark: '',
+          classification: '',
+          declarationDate: '',
+          deptCode: '',
+          creatorusername: '',
+          deptName: '',
+          approval: 0,
+          jg_contract_item0List: [],
+          jg_contract_item1List: [],
         },
-    }
+        activeayhzdd: '0',
+        rules:
+          {
+            contractType: [
+              {
+                required: true,
+                message: '请选择',
+                trigger: 'change'
+              },
+            ],
+            contractCode: [
+              {
+                required: true,
+                message: '请输入',
+                trigger: 'blur'
+              },
+              {
+                pattern: '',
+                message: '',
+                trigger: 'blur'
+              },
+            ],
+            contractName: [
+              {
+                required: true,
+                message: '请输入',
+                trigger: 'blur'
+              },
+            ],
+            bidOpeningDate: [
+              {
+                required: true,
+                message: '请选择',
+                trigger: 'change'
+              },
+            ],
+          },
+        contractTypeOptions: [{"fullName": "选项一", "id": "1"}, {"fullName": "选项二", "id": "2"}],
+        codecolumnOptions: [{"label": "供应商Code", "value": "supplier_code"}, {
+          "label": "供应商",
+          "value": "supplier_name"
+        },],
+        namecolumnOptions: [{"label": "ID", "value": "id"}, {"label": "客户编码", "value": "supplier_cd"}, {
+          "label": "客户名称",
+          "value": "supplier_nm"
+        },],
+
+      }
+    },
+    computed: {},
+    watch: {},
+    created() {
+    },
+    mounted() {
+    },
+    methods: {
+      jg_contract_item0Exist() {
+        let isOk = true;
+        for (let i = 0; i < this.dataForm.jg_contract_item0List.length; i++) {
+          const e = this.dataForm.jg_contract_item0List[i];
+        }
+        return isOk;
+      },
+      jg_contract_item1Exist() {
+        let isOk = true;
+        for (let i = 0; i < this.dataForm.jg_contract_item1List.length; i++) {
+          const e = this.dataForm.jg_contract_item1List[i];
+        }
+        return isOk;
+      },
+      goBack() {
+        this.$emit('refresh')
+      },
+      clearData(data) {
+        for (let key in data) {
+          if (data[key] instanceof Array) {
+            data[key] = [];
+          } else if (data[key] instanceof Object) {
+            this.clearData(data[key]);
+          } else {
+            data[key] = "";
+          }
+        }
+      },
+      init(id, isDetail) {
+        this.dataForm.id = id || 0;
+        this.visible = true;
+        this.isDetail = isDetail || false;
+        this.$nextTick(() => {
+          this.$refs['elForm'].resetFields();
+          if (this.dataForm.id) {
+            this.loading = true
+            request({
+              url: '/api/example/Jg_contract/' + this.dataForm.id,
+              method: 'get'
+            }).then(res => {
+              this.dataInfo(res.data)
+              this.loading = false
+            });
+          } else {
+            this.clearData(this.dataForm)
+          }
+        });
+        this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+      },
+      // 表单提交
+      dataFormSubmit() {
+        this.$refs['elForm'].validate((valid) => {
+          if (valid) {
+            if (!this.jg_contract_item0Exist()) return
+            if (!this.jg_contract_item1Exist()) return
+            this.request()
+          }
+        })
+      },
+      request() {
+        var _data = this.dataList()
+        if (!this.dataForm.id) {
+          request({
+            url: '/api/example/Jg_contract',
+            method: 'post',
+            data: _data
+          }).then((res) => {
+            this.$message({
+              message: res.msg,
+              type: 'success',
+              duration: 1000,
+              onClose: () => {
+                this.visible = false
+                this.$emit('refresh', true)
+              }
+            })
+          })
+        } else {
+          request({
+            url: '/api/example/Jg_contract/' + this.dataForm.id,
+            method: 'PUT',
+            data: _data
+          }).then((res) => {
+            this.$message({
+              message: res.msg,
+              type: 'success',
+              duration: 1000,
+              onClose: () => {
+                this.visible = false
+                this.$emit('refresh', true)
+              }
+            })
+          })
+        }
+      },
+      addjg_contract_item0List() {
+        let item = {
+          materialCode: undefined,
+          materialName: undefined,
+          specification: undefined,
+          unit: undefined,
+          num: undefined,
+          price: undefined,
+          amount: undefined,
+          rate: undefined,
+          notPrice: undefined,
+          notAmount: undefined,
+          remark: undefined,
+        }
+        this.dataForm.jg_contract_item0List.push(item)
+      },
+      deljg_contract_item0List(index) {
+        this.dataForm.jg_contract_item0List.splice(index, 1);
+      },
+      addjg_contract_item1List() {
+        let item = {
+          enclosure: undefined,
+        }
+        this.dataForm.jg_contract_item1List.push(item)
+      },
+      deljg_contract_item1List(index) {
+        this.dataForm.jg_contract_item1List.splice(index, 1);
+      },
+      dataList() {
+        var _data = JSON.parse(JSON.stringify(this.dataForm));
+        _data.approval = parseInt(_data.approval)
+        for (let i = 0; i < _data.jg_contract_item0List.length; i++) {
+          var _list = _data.jg_contract_item0List[i];
+        }
+        for (let i = 0; i < _data.jg_contract_item1List.length; i++) {
+          var _list = _data.jg_contract_item1List[i];
+          _list.enclosure = JSON.stringify(_list.enclosure)
+        }
+        return _data;
+      },
+      dataInfo(dataAll) {
+        let _dataAll = dataAll
+        _dataAll.approval = parseInt(_dataAll.approval)
+        for (let i = 0; i < _dataAll.jg_contract_item0List.length; i++) {
+          var _list = _dataAll.jg_contract_item0List[i];
+        }
+        for (let i = 0; i < _dataAll.jg_contract_item1List.length; i++) {
+          var _list = _dataAll.jg_contract_item1List[i];
+          _list.enclosure = JSON.parse(_list.enclosure)
+        }
+        this.dataForm = _dataAll
+      },
+    },
+  }
 
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/jg_contract/index.vue b/SC-web/src/views/scm/basicInformation/jg_contract/index.vue
index db6d52d8..6efc7801 100644
--- a/SC-web/src/views/scm/basicInformation/jg_contract/index.vue
+++ b/SC-web/src/views/scm/basicInformation/jg_contract/index.vue
@@ -43,37 +43,37 @@
         <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
                     @selection-change="handleSelectionChange">
           <el-table-column prop="contractCode" label="合同编码" width="0" align="left"
-          />
+                           v-if="jnpf.hasP('contractCode')"/>
           <el-table-column prop="contractName" label="合同名称" width="0" align="left"
-          />
+                           v-if="jnpf.hasP('contractName')"/>
           <el-table-column prop="contractNo" label="对方合同号" width="0" align="left"
-          />
+                           v-if="jnpf.hasP('contractNo')"/>
           <el-table-column label="合同类型 " width="0" prop="contractType" algin="left"
-          >
+                           v-if="jnpf.hasP('contractType')">
             <template slot-scope="scope">
               {{ scope.row.contractType | dynamicText(contractTypeOptions) }}
             </template>
           </el-table-column>
           <el-table-column prop="classification" label="合同分类 " width="0" align="left"
-          />
+                           v-if="jnpf.hasP('classification')"/>
           <el-table-column prop="declarationDate" label="申报日期" width="0" align="left"
-          />
-          <el-table-column prop="name" label="供应商/客户名" width="0" align="left"
-          />
+                           v-if="jnpf.hasP('declarationDate')"/>
+          <el-table-column prop="name" label="供应商/客户id" width="0" align="left"
+                           v-if="jnpf.hasP('name')"/>
           <el-table-column prop="num" label="数量" width="0" align="left"
-          />
+                           v-if="jnpf.hasP('num')"/>
           <el-table-column prop="amount" label="金额" width="0" align="left"
-          />
+                           v-if="jnpf.hasP('amount')"/>
           <el-table-column prop="deptName" label="部门名称" width="0" align="left"
-          />
+                           v-if="jnpf.hasP('deptName')"/>
           <el-table-column prop="remark" label="备注" width="0" align="left"
-          />
+                           v-if="jnpf.hasP('remark')"/>
           <el-table-column prop="creatorusername" label="录入人" width="0" align="left"
-          />
+                           v-if="jnpf.hasP('creatorusername')"/>
           <el-table-column prop="status" label="合同状态" width="0" align="left"
-          />
+                           v-if="jnpf.hasP('status')"/>
           <el-table-column prop="approval" label="集团审批" width="0" align="left"
-          />
+                           v-if="jnpf.hasP('approval')"/>
           <el-table-column label="操作" fixed="right"
                            width="150">
             <template slot-scope="scope">
@@ -138,7 +138,7 @@
           {prop: 'contractType', label: '合同类型 '},
           {prop: 'classification', label: '合同分类 '},
           {prop: 'declarationDate', label: '申报日期'},
-          {prop: 'name', label: '供应商/客户名'},
+          {prop: 'name', label: '供应商/客户id'},
           {prop: 'num', label: '数量'},
           {prop: 'amount', label: '金额'},
           {prop: 'deptName', label: '部门名称'},