jiangn преди 1 година
родител
ревизия
59be00bbbe
променени са 4 файла, в които са добавени 24 реда и са изтрити 9 реда
  1. 2 0
      src/config/index.js
  2. 1 0
      src/mixins/index.js
  3. 12 0
      src/view/fin/money-account/index.vue
  4. 9 9
      src/view/pur/pur-order/index.vue

+ 2 - 0
src/config/index.js

@@ -329,6 +329,8 @@ export default {
     freezed: 't_psi_freeze',
     // 商品档案
     sku: 't_mst_goods_sku',
+    // 资金账户
+    moneyAccount:'t_mst_money_account'
   },
   /**
    *   @desc   : 在产盘点盘点状态

+ 1 - 0
src/mixins/index.js

@@ -402,6 +402,7 @@ export const indexMixin = {
         // this.params.cpId = this.$store.state.user.cpId;
 
         // 如果主键id有值需要在新建时清空主键Id
+        console.log("this.params[this.primaryKey]",this.params)
         if (this.primaryKey && button === 'add' && this.params[this.primaryKey]) {
           this.params[this.primaryKey] = null;
         }

+ 12 - 0
src/view/fin/money-account/index.vue

@@ -65,6 +65,9 @@
         <DkFormItem prop="initBalance">
           <InputNumberPop v-model="formData.initBalance"/>
         </DkFormItem>
+        <DkFormItem prop="balance" v-if="modalParams.button === $config.formMode.edit">
+          <InputNumberPop v-model="formData.balance" :disabled="true"/>
+        </DkFormItem>
         <!--开户日期-->
         <DkFormItem prop="accDate" :label="$t('initDate')" :data-type="$config.dataType.date">
           <DatePickerPop v-model="formData.accDate" :short-cut-flag="true"/>
@@ -76,6 +79,9 @@
           <InputPop v-model="formData.remarks" textareaFlag/>
         </DkFormItem>
       </DkForm>
+      <!--附件-->
+      <DkPicWall v-model="formData.annexPaths"
+                 :table="$config.tables.moneyAccount" :accept="$config.uploadFileConfig.acceptPicType"></DkPicWall>
     </DkModal>
   </div>
 </template>
@@ -92,6 +98,7 @@ export default {
       // 资金类别
       macTypeList: [],
       formData: {
+        macId:null,
         macName: null,
         macType: null,
         initBalance: null,
@@ -102,6 +109,7 @@ export default {
         orgId: self.$store.state.user.orgId,
         staffId: self.$store.state.user.id,
         makeStaff: self.$store.state.user.id,
+        annexPaths:null,
       },
       //查询
       searchContent: [
@@ -176,6 +184,10 @@ export default {
      */
     saveData() {
       this.params.accDate = new Date(this.params.accDate).toDateStr();
+      // 部门
+      this.params.orgId = this.$store.state.user.orgId
+      // 员工
+      this.params.staffId = this.$store.state.user.staffId
       if (this.modalParams.button === this.$config.formMode.add) {
         return this.excute(this.$service.moneyAccountService, this.$service.moneyAccountService.insert, this.params);
       } else {

+ 9 - 9
src/view/pur/pur-order/index.vue

@@ -316,6 +316,15 @@ export default {
           valueKind: 'M-CHOICE'
         },
         {
+          itemCode: '制单日期-时间',
+          itemName: 'makeTime',
+          valueFormat: {
+            code: 'makeTime',
+            default: [new Date().addMonths(-1).format('yyyy-MM-dd'), new Date().format('yyyy-MM-dd')]
+          },
+          valueKind: 'DATE_RANGE'
+        },
+        {
           itemCode: '商品名称-文本',
           itemName: 'skuModel',
           valueFormat: {code: 'skuModel'},
@@ -327,15 +336,6 @@ export default {
           valueFormat: {code: 'skuName'},
           valueKind: 'STR'
         },
-        {
-          itemCode: '制单日期-时间',
-          itemName: 'makeTime',
-          valueFormat: {
-            code: 'makeTime',
-            default: [new Date().addMonths(-1).format('yyyy-MM-dd'), new Date().format('yyyy-MM-dd')]
-          },
-          valueKind: 'DATE_RANGE'
-        },
       ],
     }
   },