修改页面操作

src/views/activiti/form/ProcessUdgetPlanForm.vue

@@ -54,7 +54,7 @@
             </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-upload v-decorator="['fileId']" :trigger-change="true"></j-upload>
             </a-form-item>
           </a-col>
@@ -65,15 +65,20 @@
     <a-tabs v-model="activeKey" @change="handleChangeTabs" ref="tabs">
       <a-tab-pane tab="预算计划采购流程物料清单表" :key="refKeys[0]" :forceRender="true">
         <j-editable-table
-          :ref="refKeys[0]"
+          ref="processUdgetPlanMaterial"
           :loading="processUdgetPlanMaterialTable.loading"
           :columns="processUdgetPlanMaterialTable.columns"
           :dataSource="processUdgetPlanMaterialTable.dataSource"
+          @valueChange ="onSelect"
           :maxHeight="300"
-          :disabled="formDisabled"
           :rowNumber="true"
           :rowSelection="true"
           :actionButton="true"/>
+
+        <template v-slot:materialCode="props">
+          <a-input :value="props.text" disabled />
+        </template>
+
       </a-tab-pane>
     </a-tabs>
     <div class="div_process">
@@ -118,6 +123,7 @@
     },
     data() {
       return {
+        bigId:[],
         labelCol: {
           xs: { span: 24 },
           sm: { span: 6 }
@@ -145,14 +151,24 @@
           loading: false,
           dataSource: [],
           columns: [
+
             {
               title: '物料组',
               key: 'materialGroup',
-              type: FormTypes.select,
+              // type: FormTypes.slot, //  <-------------改为 slot 格式
+              // slotName: 'actions',   //  <-------------slot 的名称，对应 v-slot 冒号后面和等号前面的内容
+              type: FormTypes.sel_search,
               dictCode: '',
               width: '200px',
               placeholder: '请输入${title}',
-              defaultValue: ''
+              options: [],
+              props:{title: 'show title'}
+              // scopedSlots: { customRender: 'edit' },//引入的插槽
+              // customRender:function (t,r,index) {
+              //     console.log(t,r);
+              //
+              // }
+
             },
             {
               title: '物料号',
@@ -309,6 +325,8 @@
           add: '/hy/processUdgetPlan/add',
           edit: '/hy/processUdgetPlan/edit',
           queryById: '/hy/processUdgetPlan/queryById',
+          descriptionRake: "/description/processDescription/descriptionName",
+          merchandiseNewsList: "/merchandisenews/processMerchandiseNews/merchandiseNewsList",
           processUdgetPlanMaterial: {
             list: '/hy/processUdgetPlan/queryProcessUdgetPlanMaterialByMainId'
           }
@@ -374,8 +392,61 @@
         this.init();
       }
       this.getAllTable()
+      this.fetchData();
     },
     methods: {
+      onSelect(record) {
+        // this.$refs.processUdgetPlanMaterial.getValues((error, values) => {
+        //
+        //     console.log(error, values)
+        // })
+
+        console.log(record.row);
+        console.log(record.row.materialGroup);
+        if(record.row.materialGroup.length > 0){
+          console.log("执行l")
+          this.fetchMerchandiseNews(record.row.materialGroup);
+        }
+
+      },
+      fetchMerchandiseNews(value){ //查询物料组
+        //查询大品类数据
+        let par = {
+          delFlag: 0,
+          descriptionId:value,
+        }
+        this.bigId = [];
+        getAction(this.url.merchandiseNewsList,par).then((res)=>{
+          if(res.success){
+            console.log(res.result);
+            // res.result.forEach( item => {
+            //   this.processUdgetPlanMaterialTable.columns[0].options.push({
+            //     title : item.descriptionName,
+            //     value :  item.id,
+            //   })
+            // })
+          }
+        });
+      },
+
+      fetchData(value){ //查询物料组
+        //查询大品类数据
+        let par = {
+          delFlag: 0,
+        }
+        this.bigId = [];
+        getAction(this.url.descriptionRake,par).then((res)=>{
+          if(res.success){
+            console.log(res.result);
+            res.result.forEach( item => {
+              this.processUdgetPlanMaterialTable.columns[0].options.push({
+                title : item.descriptionName,
+                value :  item.id,
+              })
+            })
+          }
+        });
+      },
       /*回显数据*/
       init(){
         this.btndisabled = true;

src/views/dashboard/NewHomePage.vue

@@ -4,7 +4,7 @@
       <div style="display: flex;align-items: center;justify-content: stretch;width: 100%;height: 50%">
         <div style="width: 50%;padding-left: 10%;height: 100%">
           <a-card title="公司制度" style="width: 100%;height: 100%">
-            <template #extra><a-button type="primary">more</a-button></template>
+            <template #extra><a-button type="primary">更多</a-button></template>
             <p>物资管理实施细则</p>
             <a-divider style="border: 1px solid #000000"/>
           </a-card>
@@ -12,16 +12,16 @@
 
         <div style="width: 50%;padding-left: 10%;height: 100%">
           <a-card title="站内消息" style="width: 100%;height: 100%">
-            <template #extra><a-button type="primary">more</a-button></template>
-            <p>card content</p>
-            <p>card content</p>
-            <p>card content</p>
+            <template #extra><a-button type="primary">更多</a-button></template>
+<!--            <p>card content</p>-->
+<!--            <p>card content</p>-->
+<!--            <p>card content</p>-->
           </a-card>
         </div>
       </div>
       <div style="width: 100%;margin-top: 5%;margin-left: 5%;height: 50%">
         <a-card title="数据图表" style="width: 100%;height: 90%">
-          <template #extra><a-button type="primary">more</a-button></template>
+          <template #extra><a-button type="primary">更多</a-button></template>
           <div id="zhu" style="width: 24%;height: 260px;display:inline-block; "></div>
           <div id="zhu1" style="width: 24%;height: 260px;display:inline-block; margin-left: 1%"></div>
           <div id="zhu2" style="width: 24%;height: 260px;display:inline-block;margin-left: 1% "></div>
@@ -47,6 +47,15 @@ import * as echarts from 'echarts'
 export default {
 name: "NewHomePage",
   data(){
+  return{
+    url: {
+      getForm:'/actBusiness/getForm',
+      add: '/hy/processUdgetPlan/add',
+      edit: '/hy/processUdgetPlan/edit',
+      queryById: '/hy/processUdgetPlan/queryById',
+      descriptionRake: "/description/processDescription/list",
+    },
+  }
 
   },
   mounted() {

src/views/materialstorage/ProcessMaterialStorageList.vue

@@ -111,9 +111,9 @@
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
+<!--              <a-menu-item>-->
+<!--                <a @click="handleDetail(record)">详情</a>-->
+<!--              </a-menu-item>-->
               <a-menu-item>
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>

src/views/materialstorage/modules/ProcessMaterialStorageForm.vue

@@ -20,8 +20,8 @@
               <a-auto-complete
                 v-decorator="['merchandiseNewsId']" placeholder="请输入物料详情"
                 :data-source="bigMerchandiseId"
-                @select="onSearchMerchandiseNews"
-                @search="onSearch"
+                @select="onSelectRake"
+                @search="onSearchMerchandiseNews"
               />
 
             </a-form-item>
@@ -58,7 +58,7 @@
 <!--                <a-select-option v-for="(item,index) in bigId" :key="index" :value="item.id">{{item.supplierName}}</a-select-option>-->
 <!--              </a-select>-->
               <a-auto-complete
-                placeholder="请选择库存地点" v-decorator="['inventoryAddress']"
+                v-decorator="['unit']" placeholder="请输入单位"
                 :data-source="bigIdUnit"
                 @select="onSelectRake"
                 @search="onSearchRake"

src/views/unitwaste/modules/ProcessUnitWasteWarehouseCodeForm.vue

@@ -10,12 +10,12 @@
           </a-col>
           <a-col :span="8">
             <a-form-item label="账外物资编码" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="['libraryAssociationIdInvisible']" placeholder="请输入账外物资编码"  ></a-input>
+              <a-input v-decorator="['libraryAssociationIdInvisible']" placeholder="请输入账外物资编码"  :disabled = this.hideDis  ></a-input>
             </a-form-item>
           </a-col>
           <a-col :span="8">
             <a-form-item label="废旧物资编码" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="['libraryAssociationIdWaste']" placeholder="请输入废旧物资编码"  ></a-input>
+              <a-input v-decorator="['libraryAssociationIdWaste']" placeholder="请输入废旧物资编码"  :disabled = this.hideDis ></a-input>
             </a-form-item>
           </a-col>
           <a-col :span="24">
@@ -68,6 +68,7 @@
       return {
         form: this.$form.createForm(this),
         model: {},
+        hideDis : true,
         labelCol: {
           xs: { span: 24 },
           sm: { span: 6 },
@@ -96,8 +97,10 @@
     },
     computed: {
       formDisabled(){
+        // this.hideDis = false;
         if(this.formBpm===true){
           if(this.formData.disabled===false){
+            console.log(this.formData.disabled);
             return false
           }
           return true
@@ -122,10 +125,17 @@
         this.edit({});
       },
       edit (record) {
+
+
         this.form.resetFields();
         this.model = Object.assign({}, record);
         this.visible = true;
         this.$nextTick(() => {
+          if(JSON.stringify(record) ==='{}'){
+            this.hideDis = false;
+          }else{
+            this.hideDis = true;
+          }
           this.form.setFieldsValue(pick(this.model,'unit','libraryAssociationIdInvisible','libraryAssociationIdWaste','remark'))
         })
       },
@@ -156,7 +166,7 @@
                method = 'put';
             }
             let formData = Object.assign(this.model, values);
-            console.log("表单提交数据",formData)
+            console.log("表单提交数据",formData);
             httpAction(httpurl,formData,method).then((res)=>{
               if(res.success){
                 that.$message.success(res.message);