于继渤 2 年 前
コミット
a2d20f3ed0

+ 15 - 0
i18n/zh-CN.js

@@ -100,6 +100,21 @@ const basicData = {
   channelName: '渠道名称',
   dataName:'资源名称',
   dataCode:'资源编码',
+
+  incomeCode:'收入编码',
+  incomeName:'收入名称',
+
+  expenditureCode:'支出编码',
+  expenditureName:'支出名称',
+
+  reasonCode:'原因编码',
+  reasonName:'原因名称',
+
+  accountCode:'账户编码',
+  accountName:'账户名称',
+
+  sourceCode:'来源编码',
+  sourceName:'来源名称',
 }
 
 

+ 70 - 25
package-basic-data/pages/basic-data/basic-data.js

@@ -76,6 +76,26 @@ Page({
       { name: 'whName', title: mixins.$t('whName') },
       { name: 'supervisor', title: mixins.$t('supervisor') }
     ],
+    contentObj: {
+      //TODO 怎么国际化 ?
+      '仓库档案': [{ name: 'whCode', title: mixins.$t('whCode') },
+      { name: 'whName', title: mixins.$t('whName') },
+      { name: 'supervisor', title: mixins.$t('supervisor') }],
+      '销售渠道': [{ name: 'channelCode', title: mixins.$t('channelCode') },
+      { name: 'channelName', title: mixins.$t('channelName') }],
+      '收入类别': [{ name: 'dataCode', title: mixins.$t('incomeCode') },
+      { name: 'dataValue', title: mixins.$t('incomeName') }],
+      '支出类别': [{ name: 'dataCode', title: mixins.$t('expenditureCode') },
+      { name: 'dataValue', title: mixins.$t('expenditureName') }],
+      '入库原因': [{ name: 'dataCode', title: mixins.$t('reasonCode') },
+      { name: 'dataValue', title: mixins.$t('reasonName') }],
+      '出库原因': [{ name: 'dataCode', title: mixins.$t('reasonCode') },
+      { name: 'dataValue', title: mixins.$t('reasonName') }],
+      '账户类别': [{ name: 'dataCode', title: mixins.$t('accountCode') },
+      { name: 'dataValue', title: mixins.$t('accountName') }],
+      '客户来源': [{ name: 'dataCode', title: mixins.$t('sourceCode') },
+      { name: 'dataValue', title: mixins.$t('sourceName') }],
+    },
     popContent:
       [
         { code: 'whCode', type: 'str', title: mixins.$t('whCode'), required: false, readonly: true, },
@@ -98,12 +118,6 @@ Page({
     let contentList = this.data.contentList
     let routeObjNameGoTo = this.data.routeObjNameGoTo
     if (formDataName == mixins.$t('warehouse')) {//仓库档案
-      //设置列表字段
-      contentList = [
-        { name: 'whCode', title: mixins.$t('whCode') },
-        { name: 'whName', title: mixins.$t('whName') },
-        { name: 'supervisor', title: mixins.$t('supervisor') }
-      ]
       //设置新建编辑字段
       popContent =
         [
@@ -115,11 +129,6 @@ Page({
         ]
       routeObjNameGoTo = 'warehouse'
     } else if (formDataName == mixins.$t('saleChannel')) {
-      //设置列表字段
-      contentList = [
-        { name: 'channelCode', title: mixins.$t('channelCode') },
-        { name: 'channelName', title: mixins.$t('channelName') }
-      ]
       //设置新建编辑字段
       popContent =
         [
@@ -128,19 +137,55 @@ Page({
           { code: 'remarks', type: 'str', title: mixins.$t('remarks'), required: false }
         ]
     } else {
-      //设置列表字段
-      contentList = [
-        { name: 'dataCode', title: mixins.$t('channelCode') },
-        { name: 'dataValue', title: mixins.$t('channelName') }
-      ]
-      //设置新建编辑字段
-      popContent =
-        [
-          { code: 'dataCode', type: 'str', title: mixins.$t('channelCode'), required: false, readonly: true, },
-          { code: 'dataValue', type: 'str', title: mixins.$t('channelName'), required: true },
-          { code: 'remarks', type: 'str', title: mixins.$t('remarks'), required: false }
-        ]
-
+      if (formDataName == mixins.$t('incomeCategory')) {
+        //设置新建编辑字段 收入类别
+        popContent =
+          [
+            { code: 'dataCode', type: 'str', title: mixins.$t('incomeCode'), required: false, readonly: true, },
+            { code: 'dataValue', type: 'str', title: mixins.$t('incomeName'), required: true }
+          ]
+      }
+      if (formDataName == mixins.$t('expenditureCategory')) {
+        //设置新建编辑字段 支出类别
+        popContent =
+          [
+            { code: 'dataCode', type: 'str', title: mixins.$t('expenditureCode'), required: false, readonly: true, },
+            { code: 'dataValue', type: 'str', title: mixins.$t('expenditureName'), required: true }
+          ]
+      }
+      if (formDataName == mixins.$t('reasonStorage')) {
+        //设置新建编辑字段 入库原因
+        popContent =
+          [
+            { code: 'dataCode', type: 'str', title: mixins.$t('reasonCode'), required: false, readonly: true, },
+            { code: 'dataValue', type: 'str', title: mixins.$t('reasonName'), required: true }
+          ]
+      }
+      if (formDataName == mixins.$t('reasonOutbound')) {
+        //设置新建编辑字段 出库原因
+        popContent =
+          [
+            { code: 'dataCode', type: 'str', title: mixins.$t('reasonCode'), required: false, readonly: true, },
+            { code: 'dataValue', type: 'str', title: mixins.$t('reasonName'), required: true }
+          ]
+      }
+      if (formDataName == mixins.$t('accountCategory')) {
+        //设置新建编辑字段 账户类别
+        popContent =
+          [
+            { code: 'dataCode', type: 'str', title: mixins.$t('accountCode'), required: false, readonly: true, },
+            { code: 'dataValue', type: 'str', title: mixins.$t('accountName'), required: true }
+          ]
+      }
+      if (formDataName == mixins.$t('customerSource')) {
+        //设置新建编辑字段 客户来源
+        popContent =
+          [
+            { code: 'dataCode', type: 'str', title: mixins.$t('sourceCode'), required: false, readonly: true, },
+            { code: 'dataValue', type: 'str', title: mixins.$t('sourceName'), required: true },
+          ]
+      }
+      popContent.push({ code: 'remarks', type: 'str', title: mixins.$t('remarks'), required: false })
     }
 
     this.setData({
@@ -243,7 +288,7 @@ Page({
     //有效标识
     if (params.flgValidList && params.flgValidList.indexOf("true") != -1 && params.flgValidList.indexOf("false") == -1) {
       params.flgValid = true
-    } else if(params.flgValidList && params.flgValidList.indexOf("true") == -1 && params.flgValidList.indexOf("false") != -1){
+    } else if (params.flgValidList && params.flgValidList.indexOf("true") == -1 && params.flgValidList.indexOf("false") != -1) {
       params.flgValid = false
     }
     params.dictCode = this.data.formDataName

+ 1 - 1
package-basic-data/pages/basic-data/basic-data.wxml

@@ -15,7 +15,7 @@
   </van-sidebar>
   <view style="margin-left: 140rpx;width: 100%;">
   <!-- 列表 -->
-    <dk-list list="{{tableData}}" titleImageFlag="{{false}}" swipeDisabled="{{false}}" bind:swipe="deactivateEnable" statusFlag="{{false}}" flgPoint="{{false}}" switchFlag="{{true}}" title="listItemTitle" content="{{contentList}}" collectName="" contentObj="{{contentObj}}" bind:toDetail="toDetail" bind:toPoint="toPoint" routeObjName="{{routeObjName}}" buttonList="{{buttonList}}" 
+    <dk-list list="{{tableData}}" titleImageFlag="{{false}}" swipeDisabled="{{false}}" bind:swipe="deactivateEnable" statusFlag="{{false}}" flgPoint="{{false}}" switchFlag="{{true}}" title="listItemTitle" content="{{contentList}}" collectName=""  contentObj="{{contentObj}}" contentCol="listItemTitle"  bind:toDetail="toDetail" bind:toPoint="toPoint" routeObjName="{{routeObjName}}" buttonList="{{buttonList}}" 
     defaultFlag="{{true}}" defaultFlagKey="flgDefault"
     bind:open="open"></dk-list>