修改出货流程页面

src/utils/basics/basicsquery.js

@@ -0,0 +1,27 @@
+import { getAction } from '@api/manage'
+
+
+ export function fetchDescription(url,open){ //查询物料组
+                                 //查询大品类数据
+  let par = {
+    delFlag: 0,
+  }
+  let bigId = open;
+  getAction(url,par).then((res)=>{
+    if(res.success){
+      // console.log(res.result);
+      if(bigId.length > 0){
+        bigId = [];
+      }
+      res.result.forEach( item => {
+        bigId.push({
+          title : item.descriptionName,
+          value :  item.id,
+        })
+      })
+    }
+  });
+  return bigId;
+};
+
+// export default { fetchData };

src/views/activiti/form/ProcessMaterialsDeliveryForm.vue

@@ -130,7 +130,24 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
           dataSource: [],
           columns: [
             {
-              title: '器材编号',
+              title: '物料组',
+              key: 'materialGroup',
+              // type: FormTypes.slot, //  <-------------改为 slot 格式
+              // slotName: 'actions',   //  <-------------slot 的名称，对应 v-slot 冒号后面和等号前面的内容
+              type: FormTypes.sel_search,
+              dictCode: '',
+              width: '200px',
+              placeholder: '请输入${title}',
+              options: [],
+              props:{title: 'show title'}
+              // scopedSlots: { customRender: 'edit' },//引入的插槽
+              // customRender:function (t,r,index) {
+              //     console.log(t,r);
+              //
+              // }
+            },
+            {
+              title: '物资编号',
               key: 'equipment',
               type: FormTypes.sel_search,
               dictCode:"",
@@ -141,7 +158,7 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
             {
               title: 'WBS',
               key: 'wbs',
-              type: FormTypes.sel_search,
+              type: FormTypes.input,
               dictCode:"",
               width:"200px",
               placeholder: '请输入${title}',
@@ -150,7 +167,7 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
             {
               title: '物料名称及规格型号',
               key: 'materialName',
-              type: FormTypes.sel_search,
+              type: FormTypes.input,
               dictCode:"",
               width:"200px",
               placeholder: '请输入${title}',
@@ -159,7 +176,7 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
             {
               title: '单位',
               key: 'materialUnit',
-              type: FormTypes.select,
+              type: FormTypes.input,
               dictCode:"",
               width:"200px",
               placeholder: '请输入${title}',
@@ -184,7 +201,7 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
             {
               title: '供货商',
               key: 'supplier',
-              type: FormTypes.sel_search,
+              type: FormTypes.input,
               dictCode:"",
               width:"200px",
               placeholder: '请输入${title}',
@@ -237,6 +254,7 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
           add: "/hy/processMaterialsDelivery/add",
           edit: "/hy/processMaterialsDelivery/edit",
           queryById: "/hy/processMaterialsDelivery/queryById",
+          descriptionRake: "/suppliesstronger/processSuppliesStronger/descriptionName", //查询物料组
           processMaterialsDeliveryList: {
             list: '/hy/processMaterialsDelivery/queryProcessMaterialsDeliveryListByMainId'
           },
@@ -310,8 +328,29 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
       console.log(userInfo)
       // userInfo.company=company;
       this.popupCallback(company,userInfo);
+      this.fetchData();
     },
     methods: {
+      fetchData(){ //查询物料组
+        //查询大品类数据
+        let par = {
+          delFlag: 0,
+        }
+        getAction(this.url.descriptionRake,par).then((res)=>{
+          if(res.success){
+            if(this.processMaterialsDeliveryListTable.columns[0].options.length > 0){
+              this.processMaterialsDeliveryListTable.columns[0].options = [];
+            }
+            res.result.forEach( item => {
+              this.processMaterialsDeliveryListTable.columns[0].options.push({
+                title : item.descriptionName,
+                value : item.descriptionId,
+              })
+            })
+          }
+        });
+      },
+
       /*回显数据*/
       init(){
         this.btndisabled = true;

src/views/activiti/form/ProcessUdgetPlanForm.vue

@@ -77,13 +77,10 @@
           :actionButton="true">
         <template v-slot:action="props">
           <a-tooltip placement="top">
-            <template v-slot:title="props">
-              <p>23</p>
-              <p>45</p>
-              <p>56</p>
-              <p>12</p>
+            <template v-slot:title="props" >
+              <p v-for="(item,index) in historyBigId" :key="index">历史价格：{{ item }}</p>
             </template>
-            <a-button @click="chaKan(props)">查看</a-button>
+            <a-button @mouseenter="chaKan(props)">查看</a-button>
           </a-tooltip>
 <!--          <a-button @click="chaKan(props)">查看</a-button>-->
         </template>
@@ -119,6 +116,9 @@
   import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
   import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
   import JDictSelectTag from '@/components/dict/JDictSelectTag'
+  import { fetchDescription } from '@/utils/basics/basicsquery'
+
+
   export default {
     name: 'ProcessUdgetPlanForm',
     mixins: [JEditableTableMixin],
@@ -134,6 +134,7 @@
     data() {
       return {
         bigId:[],
+        historyBigId:[],
         bigIdMerchandiseNews:[],
         bigIdMerchandiseNewsList:[],
         labelCol: {
@@ -342,6 +343,7 @@
           selectdeparment:'/sys/selectByUser',
           descriptionRake: "/description/processDescription/descriptionName",
           merchandiseNewsList: "/merchandisenews/processMerchandiseNews/merchandiseNewsList",
+          historyUrl: '/suppliesstronger/processSuppliesStronger/list',
           processUdgetPlanMaterial: {
             list: '/hy/processUdgetPlan/queryProcessUdgetPlanMaterialByMainId'
           }
@@ -422,12 +424,34 @@
       this.fetchData();
     },
     methods: {
+      //查看历史价格
+      async chaKan(log){
+        this.historyBigId = [];
+        let pas = await log.target.getValuesPromise(log.rowIds);
+        // console.log(pas);
+        if(pas[0].materialNumber !== '' && pas[0].materialNumber !== null ){
+          //查询大品类数据
+          let par = {
+            delFlag: 0,
+            merchandisenewsId: pas[0].materialNumber,
+            pageSize:5
+          }
 
-      chaKan(log){
-        console.log(log);
-      },
+          getAction(this.url.historyUrl,par).then((res)=>{
+            if(res.success) {
+              // console.log(res.result.records);
+              res.result.records.forEach( item => {
+                this.historyBigId.push(item.price);
+              })
 
+            }
+          });
+        }
+
+
+      },
 
+      //table 值改变触发
       onSelect(record) {
         // console.log(record.row);
         if(record.row.materialGroup !== '' && record.row.materialGroup !== undefined && record.row.materialNumber === ''){
@@ -452,7 +476,7 @@
               values: {
                 'materialNumber': record.row.materialNumber,
                 'materialGroup': record.row.materialGroup,
-                'materialSeries':"SM-JD36-BA",
+                'materialSeries': "SM-JD36-BA",
                 'materialName': materialName.name,
                 'materialUnit': materialName.unit,
               },
@@ -481,7 +505,7 @@
         }
 
       },
-      fetchMerchandiseNews(value){ //查询物料组
+      fetchMerchandiseNews(value){ //查询物料清单信息
         //查询大品类数据
         let par = {
           delFlag: 0,