数据字典字段修改

src/views/businessManagement/ContactManagement.vue

@@ -58,10 +58,6 @@
           @change="handleTableChange"
           class="j-table-force-nowrap">
 
-        <template slot="sex" slot-scope="text, record">
-          <div>{{ text === 1 ? '男' : text === 2 ? '女' : '' }}</div>
-        </template>
-
         <template slot="text" slot-scope="text,record">
           <j-ellipsis :value="text" :length="18"></j-ellipsis>
         </template>
@@ -127,8 +123,7 @@ export default {
           title: '性别',
           align: 'center',
           width: 80,
-          dataIndex: 'gender',
-          scopedSlots: { customRender: 'sex' }
+          dataIndex: 'gender_dictText'
         }, {
           title: '职务',
           align: 'center',

src/views/projectManagement/GeneralProjectManagement.vue

@@ -73,6 +73,12 @@
           @change="handleTableChange"
           class="j-table-force-nowrap">
 
+        <!--        项目名称-->
+        <template slot="projectName" slot-scope="text, record">
+          <j-ellipsis :value="text" :length="18" class="primary-color" @click="openDetailModal(record)"></j-ellipsis>
+        </template>
+
+
         <template slot="text" slot-scope="text,record">
           <j-ellipsis :value="text" :length="18"></j-ellipsis>
         </template>
@@ -90,6 +96,7 @@
       </a-table>
     </div>
     <general-project-module ref="modalForm" @ok="modalFormOk"></general-project-module>
+    <project-detail-modal ref="projectDetail"></project-detail-modal>
   </a-card>
 </template>
 
@@ -98,10 +105,11 @@ import { JeroListMixin } from '@/mixins/JeroListMixin'
 import JYearDate from '@comp/jero/JYearDate'
 import GeneralProjectModule from './modules/GeneralProjectModule'
 import SelectPrincipal from '@comp/company/SelectPrincipal'
+import ProjectDetailModal from '@comp/ProjectDetailModal'
 
 export default {
   name: 'GeneralProjectManagement',
-  components: { JYearDate, GeneralProjectModule, SelectPrincipal },
+  components: { JYearDate, GeneralProjectModule, SelectPrincipal, ProjectDetailModal },
   mixins: [JeroListMixin],
   computed: {
     importExcelUrl: function(){
@@ -133,12 +141,12 @@ export default {
           align: 'center',
           width: 200,
           dataIndex: 'chargeProject',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'projectName' }
         }, {
           title: '来款用途',
           align: 'center',
           width: 180,
-          dataIndex: 'chargeUse',
+          dataIndex: 'chargeUse_dictText',
           scopedSlots: { customRender: 'text' }
         }, {
           title: '来款单位',
@@ -172,12 +180,12 @@ export default {
           title: '打包',
           align: 'center',
           width: 80,
-          dataIndex: 'packaging'
+          dataIndex: 'pack'
         }, {
           title: '需要发票',
           align: 'center',
           width: 80,
-          dataIndex: 'invoice',
+          dataIndex: 'needInvoice',
           // scopedSlots: { customRender: 'icon' }
         }, {
           title: '到账',

src/views/projectManagement/modules/GeneralProjectModule.vue

@@ -30,7 +30,8 @@
           <a-form-item label="负责人" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <select-principal placeholder="请选择负责人"
                               v-decorator="['principalId',validatorRules.principalId]"
-                              :maxLength='50'></select-principal>
+                              :maxLength='50'>
+            </select-principal>
           </a-form-item>
         </a-col>
       </a-row>
@@ -91,7 +92,7 @@
         </a-col>
         <a-col :xl="12" :sm="24">
           <a-form-item label="需要发票" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <j-dict-select-tag v-decorator="['invoice',validatorRules.invoice]"
+            <j-dict-select-tag v-decorator="['needInvoice',validatorRules.needInvoice]"
                                :maxLength='50'
                                :triggerChange="true"
                                placeholder="请选择发票类型"
@@ -220,7 +221,7 @@ export default {
           rules: [{ required: true, message: '请输入应收金额' }],
           validateTrigger: 'blur'
         },
-        invoice: {
+        needInvoice: {
           rules: [{ required: true, message: '请选择发票类型' }],
           validateTrigger: 'blur'
         },
@@ -255,6 +256,7 @@ export default {
         id: record.chargeCompanyId,
         companyName: record.chargeCompanyName
       }
+      console.log(record.chargeCompany)
       // 回显选中的企业
       this.selectedCompany = record.chargeCompany
       this.form.resetFields()
@@ -262,7 +264,7 @@ export default {
       this.chargeWayType = record.chargeWay
       this.visible = true
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.model, 'chargeProject', 'year', 'principalId', 'chargeCompany', 'chargeUse', 'contactsId', 'mailContactsId', 'receivableAmount', 'invoice', 'chargeWay', 'contractNum', 'chargeNoticeNo', 'remarks'))
+        this.form.setFieldsValue(pick(this.model, 'chargeProject', 'year', 'principalId', 'chargeCompany', 'chargeUse', 'contactsId', 'mailContactsId', 'receivableAmount', 'needInvoice', 'chargeWay', 'contractNum', 'chargeNoticeNo', 'remarks'))
       })
     },
     close() {