Merge remote-tracking branch 'origin/master'

src/views/modules/srmSupplier/com_srmSupplier_share.vue

@@ -287,109 +287,6 @@ export default {
         }
       });
     },
-    saveModelData(){
-      if(this.modelSearchData.period==''||this.modelSearchData.period==null){
-        this.$message.warning('请输入Period');
-        return false
-      }
-      if(this.modelSearchData.periodStartDate==''||this.modelSearchData.periodStartDate==null){
-        this.$message.warning('请选择Period Start Date');
-        return false
-      }
-      if(this.modelSearchData.periodEndDate==''||this.modelSearchData.periodEndDate==null){
-        this.$message.warning('请输入Period End Date');
-        return false
-      }
-      this.modelSearchData.detailList=this.modelList;
-      debugger;
-      let allNumber=0
-      for (let i = 0; i <this.modelList.length ; i++) {
-        allNumber=Number(allNumber)+Number(this.modelList[i].estimateShare?this.modelList[i].estimateShare:0)
-      }
-      if(allNumber==0){
-        this.$message.warning('请至少输入一条Share！');
-        return false
-      }
-      if(allNumber>100){
-        this.$message.warning('输入Share的总和不得超过100！');
-        return false
-      }
-      console.log(allNumber)
-      saveSrmMaterialFamilySupplierShare( this.modelSearchData).then(({data})=>{
-        if (data && data.code === 0){
-          this.$message.success("保存成功");
-          this.searchTable();
-          this.modelFlag=false
-        }else {
-          this.$message.warning(data.msg);
-        }
-      }).catch((error)=>{
-        this.$message.error(error);
-      })
-    },
-    updateModel(row){
-      this.modelSearchData={
-        site:row.site,
-        materialFamilyNo:row.materialFamilyNo,
-        materialFamilyDesc:row.materialFamilyDesc,
-        period:row.period,
-        flag:1,
-        periodStartDate:row.periodStartDate,
-        periodEndDate:row.periodEndDate,
-        detailList:[],
-      }
-      searchSrmMaterialFamilySupplierShare(this.modelSearchData).then(({data}) => {
-        //区分请求成功和失败的状况
-        if (data && data.code == 0) {
-          this.modelList = data.rows
-          console.log(this.dataList)
-        } else {
-          this.modelList = [];
-        }
-      });
-      this.modelFlag=true;
-    },
-    deleteData(row){
-      this.modelSearchData={
-        site:row.site,
-        materialFamilyNo:row.materialFamilyNo,
-        materialFamilyDesc:row.materialFamilyDesc,
-        period:row.period,
-        flag:1,
-        periodStartDate:row.periodStartDate,
-        periodEndDate:row.periodEndDate,
-        detailList:[],
-      }
-      searchSrmMaterialFamilySupplierShare(this.modelSearchData).then(({data}) => {
-        //区分请求成功和失败的状况
-        if (data && data.code == 0) {
-          this.modelList = data.rows
-          console.log(this.dataList)
-        } else {
-          this.modelList = [];
-        }
-      });
-      this.delModelFlag=true;
-    },
-    delModelData(){
-      this.$confirm('确定删除整个Share?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        deleteSrmMaterialFamilySupplierShareList(this.modelList).then(({data}) => {
-          if (data && data.code === 0) {
-            this.$message.success("保存成功");
-            this.searchTable();
-            this.delModelFlag = false
-          } else {
-            this.$message.warning(data.msg);
-          }
-        }).catch((error) => {
-          this.$message.error(error);
-        })
-      })
-    }
   },
 }
 </script>

src/views/modules/srmSupplier/supplierContractRequest.vue

@@ -331,7 +331,7 @@ export default {
           serialNumber: '811011Table1RequestDate',
           tableId: "811011Table1",
           tableName: "合同Renew提醒",
-          columnProp: "requestNo",
+          columnProp: "requestDate",
           headerAlign: "center",
           align: "center",
           columnLabel: "Request Date",