預算回顯+帳外+審批意見

2 years ago · d9cbf63f22
6 changed files with 58 additions and 16 deletions
--- a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
+++ b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
@ -174,11 +174,12 @@ import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
          dataSource: [],
          columns: [
            {
-              title: '',
+              title: '物料组',
              key: 'materialGroup',
              type: FormTypes.input,
+              disabled: true,
              dictCode:"",
-              width:"0px",
+              width:"200px",
              placeholder: '请输入${title}',
              defaultValue:'',
            },
--- a/src/views/activiti/form/ProcessUdgetPlanForm.vue
+++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue
@ -239,6 +239,8 @@
    data() {
      // this.cacheData = data.map(item => ({ ...item }));
      return {
+        //用于回显物料号
+        listId:[],
        // data,
        // columns,
        // editingKey: '',
@ -862,12 +864,13 @@
          if(this.processUdgetPlanMaterialTable.columns[1].options.length > 0){
            this.processUdgetPlanMaterialTable.columns[1].options = [];
          }
-          this.$refs.processUdgetPlanMaterial.getValues((a,b,c)=>{
+        this.$refs.processUdgetPlanMaterial.getValues((a,b,c)=>{
            b.forEach(item =>{
              if(item.materialNumber !== '' && item.materialNumber !== undefined && item.materialNumber !== null){
                numberList.push(item.materialNumber);
              }
            });
+
          });
          getAction(this.url.merchandiseNewsList,par).then((res)=>{
            console.log("12312",res.result);
@ -1148,6 +1151,36 @@

        }
      },
+      /** 查询某个tab的数据 */
+      requestSubTableData(url, params, tab, success) {
+        tab.loading = true
+        getAction(url, params).then(res => {
+          let { result } = res
+          let dataSource = []
+          if (result) {
+            if (Array.isArray(result)) {
+              dataSource = result
+            } else if (Array.isArray(result.records)) {
+              dataSource = result.records
+            }
+          }
+
+          for (let i = 0; i < dataSource.length; i++) {
+            this.listId.push(dataSource[i].materialGroup)
+          }
+          console.log(this.listId)
+          for (let i = 0; i < this.listId.length; i++) {
+            console.log(this.listId[i])
+            this.fetchMerchandiseNews(this.listId[i]);
+          }
+
+          tab.dataSource = dataSource
+
+          typeof success === 'function' ? success(res) : ''
+        }).finally(() => {
+          tab.loading = false
+        })
+      },
      /** 整理成formData */
      classifyIntoFormData(allValues) {
        console.log('查看子表数据',allValues)
--- a/src/views/activiti/todoManage.vue
+++ b/src/views/activiti/todoManage.vue
@ -124,12 +124,13 @@
                 @close="lcModa.visible=false,lcModa.disabled = false"></component>
    </a-modal>
    <!-- 审批操作 -->
-    <a-modal :title="modalTaskTitle" v-model="modalTaskVisible" :mask-closable="false" :width="500">
+    <a-modal :title="modalTaskTitle" v-model="modalTaskVisible" :mask-closable="false" width="60%" height="100%">

      <div  v-if="modalTaskVisible">
        <a-form ref="form" :model="form" :label-width="85" :rules="formValidate">
          <a-form-item label="审批意见" prop="reason">
-            <a-input type="textarea" v-model="form.comment" :rows="4" />
+            <j-editor v-model="form.comment"></j-editor>
+
          </a-form-item>
          <a-form-item label="下一审批人" prop="assignees" v-show="showAssign" :error="error">
            <a-select
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
@ -5,22 +5,22 @@
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
-            <a-col :xl="4" :lg="7" :md="8" :sm="16">
+            <a-col :xl="5" :lg="7" :md="8" :sm="16">
              <a-form-item label="物料组">
                <a-input placeholder="请输入物料组" v-model="queryParam.itemGroup"></a-input>
              </a-form-item>
            </a-col>
-            <a-col :xl="4" :lg="7" :md="8" :sm="16">
+            <a-col :xl="5" :lg="7" :md="8" :sm="16">
              <a-form-item label="物料">
                <a-input placeholder="请输入物料" v-model="queryParam.item"/>
              </a-form-item>
            </a-col>
-            <a-col :xl="4" :lg="7" :md="8" :sm="16">
+            <a-col :xl="5" :lg="7" :md="8" :sm="16">
              <a-form-item label="物料描述">
                <a-input placeholder="请输入物料描述" v-model="queryParam.itemDescription"/>
              </a-form-item>
            </a-col>
-            <a-col :xl="4" :lg="7" :md="8" :sm="16">
+            <a-col :xl="5" :lg="7" :md="8" :sm="16">
              <a-form-item label="核算属性">
                <j-dict-select-tag placeholder="请输入核算属性" v-model="queryParam.accountingAttributes" dictCode="material_type"></j-dict-select-tag>
              </a-form-item>
@ -58,6 +58,7 @@
      <a-table
        ref="table"
        size="middle"
+        :srcoll="{y:460}"
        bordered
        rowKey="id"
        :columns="columns"
@ -65,7 +66,6 @@
        :pagination="ipagination"
        :loading="loading"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
        @change="handleTableChange">

        <template slot="htmlSlot" slot-scope="text">
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
@ -137,6 +137,7 @@
      <a-table
        ref="table"
        size="middle"
+        :scroll="{y:460}"
        bordered
        rowKey="id"
        :columns="columns"
@ -144,7 +145,6 @@
        :pagination="ipagination"
        :loading="loading"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
        @change="handleTableChange">
        <span slot="processId" slot-scope="text, record">
          <j-ellipsis :value="text" :length="10"/>
--- a/src/views/wastematerials/ProcessWasteMaterialsList.vue
+++ b/src/views/wastematerials/ProcessWasteMaterialsList.vue
@ -4,27 +4,33 @@
      <div class="table-page-search-wrapper">
        <a-form layout="inline" @keyup.enter.native="searchQuery">
          <a-row :gutter="24">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-col :xl="4" :lg="7" :md="8" :sm="24">
              <a-form-item label="物料组">
                <a-input placeholder="请输入物料组" v-model="queryParam.materialGroup"></a-input>
              </a-form-item>
            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-col :xl="4" :lg="7" :md="8" :sm="24">
              <a-form-item label="物料">
                <a-input placeholder="请输入物料" v-model="queryParam.materialNumber"></a-input>
              </a-form-item>
            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-col :xl="4" :lg="7" :md="8" :sm="24">
              <a-form-item label="物料描述">
                <a-input placeholder="请输入物料描述" v-model="queryParam.materialDescription"></a-input>
              </a-form-item>
            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-col :xl="4" :lg="7" :md="8" :sm="24">
              <a-form-item label="核算属性">
                <j-dict-select-tag placeholder="请输入核算属性" v-model="queryParam.accountingAttributes" dictCode="material_type"></j-dict-select-tag>
 <!--                <a-input placeholder="请输入核算属性" v-model="queryParam.accountingAttributes" dictCode="material_type"></a-input>-->
              </a-form-item>
            </a-col>
+            <a-col :xl="4" :lg="7" :md="8" :sm="24">
+              <a-form-item label="所属部门">
+                <j-select-depart v-model="queryParam.departId" />
+                <!--                <a-input placeholder="请输入核算属性" v-model="queryParam.accountingAttributes" dictCode="material_type"></a-input>-->
+              </a-form-item>
+            </a-col>
          </a-row>
        </a-form>
      </div>
@ -117,7 +123,7 @@
  import ProcessWasteMaterialsLists from '@views/wastematerials/ProcessWasteMaterialsLists'
  import { ajaxGetDictItems, getDictItemsFromCache } from '@api/api'
  import {initDictOptions, filterDictText} from '@/components/dict/JDictSelectUtil'
-
+  import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
  export default {
    name: 'ProcessWasteMaterialsList',
    mixins:[JeecgListMixin, mixinDevice],
@ -126,6 +132,7 @@
      JDate,
      ProcessWasteMaterialsModal,
      JSuperQuery,
+      JSelectDepart
    },
    data () {
      return {