前后:合同导入优化

src/dashoo.cn/backend/api/controllers/oilcontract/contract.go

@@ -112,6 +112,7 @@ func (this *OilContractController) GetEntityList() {
 	SubPackage := this.GetString("SubPackage")
 	ImportStatus := this.GetString("ImportStatus")
 	ContractClass := this.GetString("ContractClass")
+	ClassName := this.GetString("ClassName")
 
 	if Id != "" {
 		where = where + " and Id like '%" + Id + "%'"
@@ -121,6 +122,10 @@ func (this *OilContractController) GetEntityList() {
 		where = where + " and ContractClass='" + ContractClass + "' "
 	}
 
+	if ClassName != "" {
+		where = where + " and ClassName='" + ClassName + "' "
+	}
+
 	if SupplierId != "" {
 		where = where + " and SupplierId like '%" + SupplierId + "%'"
 	}
@@ -531,82 +536,95 @@ func (this *OilContractController) ImportExcel() {
 			var con1 contract.OilContract
 			lineNo := strconv.Itoa(i + 1)
 			fmt.Println(lineNo)
-			if sheet.Rows[i].Cells[0].String() != "" {
-				svc.GetEntityByWhere(OilContractName, "ContractNo = '"+sheet.Rows[i].Cells[0].String()+"'", &con1)
+			if sheet.Rows[i].Cells[2].String() != "" {
+				svc.GetEntityByWhere(OilContractName, "ContractNo = '"+sheet.Rows[i].Cells[2].String()+"'", &con1)
 				if con1.Id > 0 {
-					con1.ContractName = sheet.Rows[i].Cells[1].String()
-					con1.Amount = sheet.Rows[i].Cells[2].String()
+					con1.ContractName = sheet.Rows[i].Cells[3].String()
+					con1.Amount = sheet.Rows[i].Cells[4].String()
 					if con1.Amount == "" {
 						con1.Amount = "0"
 					}
-					con1.ClassName = sheet.Rows[i].Cells[3].String()
-					con1.ContractSonClass = sheet.Rows[i].Cells[4].String()
-					con1.SmallClass = sheet.Rows[i].Cells[5].String()
-					con1.SignedDate, _ = time.ParseInLocation("2006-01-02", convertToFormatDay(sheet.Rows[i].Cells[6].Value), time.Local)
+					con1.ClassName = sheet.Rows[i].Cells[0].String()
+					if con1.ClassName == "买卖合同" {
+						con1.ContractClass = "01"
+					} else {
+						con1.ContractClass = "03"
+					}
+					//con1.ContractSonClass = sheet.Rows[i].Cells[4].String()
+					//con1.SmallClass = sheet.Rows[i].Cells[5].String()
+					con1.SignedDate, _ = time.ParseInLocation("2006-01-02", convertToFormatDay(sheet.Rows[i].Cells[7].Value), time.Local)
 					con1.Number = sheet.Rows[i].Cells[10].String()
-					con1.ChooseWay = sheet.Rows[i].Cells[11].String()
-					con1.ContractMark = sheet.Rows[i].Cells[14].String()
-					con1.Currency = sheet.Rows[i].Cells[15].String()
-					con1.BudgetAmount = sheet.Rows[i].Cells[16].String()
+					//con1.ChooseWay = sheet.Rows[i].Cells[11].String()
+					//con1.ContractMark = sheet.Rows[i].Cells[14].String()
+					//con1.Currency = sheet.Rows[i].Cells[15].String()
+					//con1.BudgetAmount = sheet.Rows[i].Cells[16].String()
 					if con.BudgetAmount == "" {
 						con.BudgetAmount = "0"
 					}
-					con1.PerformAmount = sheet.Rows[i].Cells[17].String()
+					//con1.PerformAmount = sheet.Rows[i].Cells[17].String()
 					if con1.PerformAmount == "" {
 						con1.PerformAmount = "0"
 					}
 					con1.IsYearMoney = con1.PerformAmount
 					con1.IsInternal = 0
-					if sheet.Rows[i].Cells[18].String() == "是" {
-						con1.IsInternal = 1
-					}
+					//if sheet.Rows[i].Cells[18].String() == "是" {
+					//	con1.IsInternal = 1
+					//}
 					con1.IsForeign = 0
-					if sheet.Rows[i].Cells[19].String() == "是" {
-						con1.IsForeign = 1
-					}
+					//if sheet.Rows[i].Cells[19].String() == "是" {
+					//	con1.IsForeign = 1
+					//}
 					con1.IsDeal = 0
-					if sheet.Rows[i].Cells[20].String() == "是" {
-						con1.IsDeal = 1
-					}
-					con1.MoneyFlows = sheet.Rows[i].Cells[21].String()
-					con1.MoneyChannel = sheet.Rows[i].Cells[22].String()
-					con1.MoneyChannelSon = sheet.Rows[i].Cells[23].String()
-					con1.MoneyChannelSmall = sheet.Rows[i].Cells[24].String()
-					con1.SingUnit = sheet.Rows[i].Cells[25].String()
-					con1.Place = sheet.Rows[i].Cells[28].String()
-
-					con1.StartDate, _ = time.ParseInLocation("2006-01-02", convertToFormatDay(sheet.Rows[i].Cells[29].Value), time.Local)
-					con1.EndDate, _ = time.ParseInLocation("2006-01-02", convertToFormatDay(sheet.Rows[i].Cells[30].Value), time.Local)
-					con1.YearDate, _ = time.ParseInLocation("2006-01-02", convertToFormatDay(sheet.Rows[i].Cells[30].Value), time.Local)
-					con1.DisputeResolution = sheet.Rows[i].Cells[31].String()
-
-					con1.Remark = sheet.Rows[i].Cells[32].String()
-					if con1.ProjectOwner != sheet.Rows[i].Cells[33].String() {
-						con1.ProjectOwner = con1.ProjectOwner + "," + sheet.Rows[i].Cells[33].String()
+					//if sheet.Rows[i].Cells[20].String() == "是" {
+					//	con1.IsDeal = 1
+					//}
+					//con1.MoneyFlows = sheet.Rows[i].Cells[21].String()
+					//con1.MoneyChannel = sheet.Rows[i].Cells[22].String()
+					//con1.MoneyChannelSon = sheet.Rows[i].Cells[23].String()
+					//con1.MoneyChannelSmall = sheet.Rows[i].Cells[24].String()
+					//con1.SingUnit = sheet.Rows[i].Cells[25].String()
+					//con1.Place = sheet.Rows[i].Cells[28].String()
+
+					con1.StartDate, _ = time.ParseInLocation("2006-01-02", convertToFormatDay(sheet.Rows[i].Cells[8].Value), time.Local)
+					con1.EndDate, _ = time.ParseInLocation("2006-01-02", convertToFormatDay(sheet.Rows[i].Cells[9].Value), time.Local)
+					con1.YearDate, _ = time.ParseInLocation("2006-01-02", convertToFormatDay(sheet.Rows[i].Cells[9].Value), time.Local)
+					//con1.DisputeResolution = sheet.Rows[i].Cells[31].String()
+
+					//con1.Remark = sheet.Rows[i].Cells[32].String()
+					if con1.ProjectOwner != sheet.Rows[i].Cells[6].String() {
+						con1.ProjectOwner = con1.ProjectOwner + "," + sheet.Rows[i].Cells[6].String()
 					}
-					con1.SubmitDate, _ = time.ParseInLocation("2006-01-02", convertToFormatDay(sheet.Rows[i].Cells[34].Value), time.Local)
-					con1.SealName = sheet.Rows[i].Cells[42].String()
+					//con1.SubmitDate, _ = time.ParseInLocation("2006-01-02", convertToFormatDay(sheet.Rows[i].Cells[34].Value), time.Local)
+					//con1.SealName = sheet.Rows[i].Cells[42].String()
 					//con1.PoNumber = sheet.Rows[i].Cells[31].String()
 					//con1.ImportStatus = 0
 					svc.UpdateEntityById(con1.Id, &con1)
 					continue
 				}
 			}
-			con.ContractNo = sheet.Rows[i].Cells[0].String()
-			con.ContractName = sheet.Rows[i].Cells[1].String()
-			con.Amount = sheet.Rows[i].Cells[2].String()
+			con.ClassName = sheet.Rows[i].Cells[0].String()
+			if con.ClassName == "买卖合同" {
+				con.ContractClass = "01"
+			} else {
+				con.ContractClass = "03"
+			}
+			con.ImportSupplierName = sheet.Rows[i].Cells[1].String()
+			con.ContractNo = sheet.Rows[i].Cells[2].String()
+			con.ContractName = sheet.Rows[i].Cells[3].String()
+			con.Amount = sheet.Rows[i].Cells[4].String()
 			if con.Amount == "" {
 				con.Amount = "0"
 			}
-			con.ClassName = sheet.Rows[i].Cells[3].String()
+			con.ImportSecondUnit = sheet.Rows[i].Cells[5].String()
+			con.ProjectOwner = sheet.Rows[i].Cells[6].String()
 
-			con.ContractSonClass = sheet.Rows[i].Cells[4].String()
-			con.SmallClass = sheet.Rows[i].Cells[5].String()
+			//con.ContractSonClass = sheet.Rows[i].Cells[4].String()
+			//con.SmallClass = sheet.Rows[i].Cells[5].String()
 			//con.SignedDate = convertToFormatDay(sheet.Rows[i].Cells[6].Value)
-			con.SignedDate, _ = time.ParseInLocation("2006-01-02", convertToFormatDay(sheet.Rows[i].Cells[6].Value), time.Local)
-			con.ImportSecondUnit = sheet.Rows[i].Cells[8].String()
-
-			con.ImportSupplierName = sheet.Rows[i].Cells[9].String()
+			con.SignedDate, _ = time.ParseInLocation("2006-01-02", convertToFormatDay(sheet.Rows[i].Cells[7].Value), time.Local)
+			con.StartDate, _ = time.ParseInLocation("2006-01-02", convertToFormatDay(sheet.Rows[i].Cells[8].Value), time.Local)
+			con.EndDate, _ = time.ParseInLocation("2006-01-02", convertToFormatDay(sheet.Rows[i].Cells[9].Value), time.Local)
+			con.YearDate, _ = time.ParseInLocation("2006-01-02", convertToFormatDay(sheet.Rows[i].Cells[9].Value), time.Local)
 			var supp supplier.OilSupplier
 			svc.GetEntityByWhere(OilSupplierName, "SupplierName = '"+con.ImportSupplierName+"'", &supp)
 			if supp.Id > 0 {
@@ -614,51 +632,48 @@ func (this *OilContractController) ImportExcel() {
 				con.SupplierName = supp.SupplierName
 			}
 			var org organize.Base_Organize
-			svc.GetEntityByWhere("Base_Organize", "FullName = '"+sheet.Rows[i].Cells[8].String()+"'", &org)
+			svc.GetEntityByWhere("Base_Organize", "FullName = '"+sheet.Rows[i].Cells[5].String()+"'", &org)
 			if org.Id > 0 {
 				con.SecondUnit = org.Id
 				con.SecondUnitName = org.Fullname
 			}
 			con.Number = sheet.Rows[i].Cells[10].String()
-			con.ChooseWay = sheet.Rows[i].Cells[11].String()
-			con.ContractMark = sheet.Rows[i].Cells[14].String()
-			con.Currency = sheet.Rows[i].Cells[15].String()
-			con.BudgetAmount = sheet.Rows[i].Cells[16].String()
+			//con.ChooseWay = sheet.Rows[i].Cells[11].String()
+			//con.ContractMark = sheet.Rows[i].Cells[14].String()
+			//con.Currency = sheet.Rows[i].Cells[15].String()
+			//con.BudgetAmount = sheet.Rows[i].Cells[16].String()
 			if con.BudgetAmount == "" {
 				con.BudgetAmount = "0"
 			}
-			con.PerformAmount = sheet.Rows[i].Cells[17].String()
+			//con.PerformAmount = sheet.Rows[i].Cells[17].String()
 			if con.PerformAmount == "" {
 				con.PerformAmount = "0"
 			}
 			con.IsYearMoney = con.PerformAmount
 			con.IsInternal = 0
-			if sheet.Rows[i].Cells[18].String() == "是" {
-				con.IsInternal = 1
-			}
+			//if sheet.Rows[i].Cells[18].String() == "是" {
+			//	con.IsInternal = 1
+			//}
 			con.IsForeign = 0
-			if sheet.Rows[i].Cells[19].String() == "是" {
-				con.IsForeign = 1
-			}
+			//if sheet.Rows[i].Cells[19].String() == "是" {
+			//	con.IsForeign = 1
+			//}
 			con.IsDeal = 0
-			if sheet.Rows[i].Cells[20].String() == "是" {
-				con.IsDeal = 1
-			}
-			con.MoneyFlows = sheet.Rows[i].Cells[21].String()
-			con.MoneyChannel = sheet.Rows[i].Cells[22].String()
-			con.MoneyChannelSon = sheet.Rows[i].Cells[23].String()
-			con.MoneyChannelSmall = sheet.Rows[i].Cells[24].String()
-			con.SingUnit = sheet.Rows[i].Cells[25].String()
-			con.Place = sheet.Rows[i].Cells[28].String()
-
-			con.StartDate, _ = time.ParseInLocation("2006-01-02", convertToFormatDay(sheet.Rows[i].Cells[29].Value), time.Local)
-			con.EndDate, _ = time.ParseInLocation("2006-01-02", convertToFormatDay(sheet.Rows[i].Cells[30].Value), time.Local)
-			con.YearDate, _ = time.ParseInLocation("2006-01-02", convertToFormatDay(sheet.Rows[i].Cells[30].Value), time.Local)
-			con.DisputeResolution = sheet.Rows[i].Cells[31].String()
-			con.Remark = sheet.Rows[i].Cells[32].String()
-			con.ProjectOwner = sheet.Rows[i].Cells[33].String()
-			con.SubmitDate, _ = time.ParseInLocation("2006-01-02", convertToFormatDay(sheet.Rows[i].Cells[34].Value), time.Local)
-			con.SealName = sheet.Rows[i].Cells[42].String()
+			//if sheet.Rows[i].Cells[20].String() == "是" {
+			//	con.IsDeal = 1
+			//}
+			//con.MoneyFlows = sheet.Rows[i].Cells[21].String()
+			//con.MoneyChannel = sheet.Rows[i].Cells[22].String()
+			//con.MoneyChannelSon = sheet.Rows[i].Cells[23].String()
+			//con.MoneyChannelSmall = sheet.Rows[i].Cells[24].String()
+			//con.SingUnit = sheet.Rows[i].Cells[25].String()
+			//con.Place = sheet.Rows[i].Cells[28].String()
+
+			//con.DisputeResolution = sheet.Rows[i].Cells[31].String()
+			//con.Remark = sheet.Rows[i].Cells[32].String()
+			//con.ProjectOwner = sheet.Rows[i].Cells[33].String()
+			//con.SubmitDate, _ = time.ParseInLocation("2006-01-02", convertToFormatDay(sheet.Rows[i].Cells[34].Value), time.Local)
+			//con.SealName = sheet.Rows[i].Cells[42].String()
 			//con.PoNumber = sheet.Rows[i].Cells[32].String()
 			con.ImportStatus = 0
 			con.Status = 1
@@ -812,6 +827,16 @@ func (this *OilContractController) ImportUpdate() {
 // excel日期字段格式化 yyyy-mm-dd
 func convertToFormatDay(excelDaysString string) string {
 	if strings.Index(excelDaysString, "/") != -1 {
+		arr := strings.Split(excelDaysString, "/")
+		if len(arr) == 3 {
+			if len(arr[1]) == 1 {
+				arr[1] = "0" + arr[1]
+			}
+			if len(arr[2]) == 1 {
+				arr[2] = "0" + arr[2]
+			}
+			excelDaysString = strings.Join(arr, "-")
+		}
 		return excelDaysString
 	}
 	// 2006-01-02 距离 1900-01-01的天数

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-import/index.vue

@@ -278,6 +278,9 @@
       :close-on-click-modal="false"
       width="80%">
       <el-form ref="form" :inline="true" style="float: right; margin-top: -20px">
+        <el-form-item label="合同类别">
+          <el-input size="mini" clearable v-model="searchForm.ClassName" style="width: 150px;" placeholder="请输入合同类别"></el-input>
+        </el-form-item>
         <el-form-item label="企业名称">
           <el-input size="mini" clearable v-model="searchForm.ImportSupplierName" style="width: 150px;" placeholder="请输入企业名称"></el-input>
         </el-form-item>
@@ -287,21 +290,21 @@
         <el-form-item label="二级单位">
           <el-input size="mini" clearable v-model="searchForm.ImportUnitName" style="width: 150px;" placeholder="请输入二级单位"></el-input>
         </el-form-item>
-        <el-form-item label="状态" style="width: 150px">
-          <el-select size="mini" v-model="searchForm.Status" placeholder="请选择" style="width: 100px" clearable>
-            <el-option label="全部" value="" key="01"></el-option>
-            <el-option label="未履行" :value="1" key="02"></el-option>
-            <el-option label="履行中" :value="2" key="03"></el-option>
-            <el-option label="履行完毕" :value="3" key="04"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="结算状态" style="width: 180px">
-          <el-select size="mini" v-model="searchForm.SettleStatus" placeholder="请选择" style="width: 110px" clearable>
-            <el-option label="全部" value="" key="01"></el-option>
-            <el-option label="未结算" value="1" key="02"></el-option>
-            <el-option label="阶段性结算" value="2" key="03"></el-option>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="状态" style="width: 150px">-->
+<!--          <el-select size="mini" v-model="searchForm.Status" placeholder="请选择" style="width: 100px" clearable>-->
+<!--            <el-option label="全部" value="" key="01"></el-option>-->
+<!--            <el-option label="未履行" :value="1" key="02"></el-option>-->
+<!--            <el-option label="履行中" :value="2" key="03"></el-option>-->
+<!--            <el-option label="履行完毕" :value="3" key="04"></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="结算状态" style="width: 180px">-->
+<!--          <el-select size="mini" v-model="searchForm.SettleStatus" placeholder="请选择" style="width: 110px" clearable>-->
+<!--            <el-option label="全部" value="" key="01"></el-option>-->
+<!--            <el-option label="未结算" value="1" key="02"></el-option>-->
+<!--            <el-option label="阶段性结算" value="2" key="03"></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item>
           <el-dropdown split-button type="primary" size="mini" @click="handleSearch1" @command="searchCommand1">
             查询
@@ -334,14 +337,6 @@
               <el-button size="mini" type="primary" @click="allUpdate(scope.row.ContractClass,scope.row.ClassName,'ContractClass', 0, scope.row.SupplierId)">全部修改</el-button>
             </template>
           </el-table-column>
-          <el-table-column  prop="ContractNo"  min-width="200" label="合同编号" align="center" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <el-form-item  style="margin-bottom: 0px;" :prop="'tableData.' + scope.$index + '.ContractNo'" :rules="rules.ContractNo">
-                <el-input v-if="scope.row.ContractNo == ''" size="mini" v-model="scope.row.ContractNo" style="width:100%" placeholder="请输入"></el-input>
-                <el-input v-else size="mini" v-model="scope.row.ContractNo" style="width:100%" placeholder="请输入" readonly></el-input>
-              </el-form-item>
-            </template>
-          </el-table-column>
           <el-table-column  prop="ImportSupplierName"  min-width="250" label="企业名称" align="center" show-overflow-tooltip></el-table-column>
           <el-table-column  prop="SupplierName"  width="220" label="确认企业名称" align="center" show-overflow-tooltip >
              <template slot-scope="scope">
@@ -353,27 +348,37 @@
                <el-button size="mini" type="primary" @click="allUpdate(scope.row.SupplierId,scope.row.ImportSupplierName,'SupplierId', 0, scope.row.SupplierId)">全部修改</el-button>
              </template>
            </el-table-column>
-          <el-table-column  prop="Status"  min-width="120" label="选择合同状态" align="center" show-overflow-tooltip >
-            <template slot-scope="scope">
-              <el-form-item  style="margin-bottom: 0px;" :prop="'tableData.' + scope.$index + '.Status'" :rules="rules.Status">
-                <el-select size="mini" v-model="scope.row.Status" placeholder="请选择" style="width: 100%" @change="allUpdate(scope.row.Status,'','Status',scope.row.Id, scope.row.SupplierId)">
-                  <el-option label="未履行" :value="1" key="01"></el-option>
-                  <el-option label="履行中" :value="2" key="02"></el-option>
-                  <el-option label="已完结" :value="3" key="03"></el-option>
-                </el-select>
-              </el-form-item>
-            </template>
-          </el-table-column>
-          <el-table-column  prop="SettleStatus"  min-width="110" label="结算状态" align="center" show-overflow-tooltip >
+          <el-table-column  prop="ContractNo"  min-width="200" label="合同编号" align="center" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-form-item  style="margin-bottom: 0px;" :prop="'tableData.' + scope.$index + '.SettleStatus'" :rules="rules.SettleStatus">
-                <el-select size="mini" v-model="scope.row.SettleStatus" placeholder="请选择" style="width: 100%" @change="allUpdate(scope.row.SettleStatus,'','SettleStatus',scope.row.Id, scope.row.SupplierId)">
-                  <el-option label="未结算" value="1" key="01"></el-option>
-                  <el-option label="阶段性结算" value="2" key="02"></el-option>
-                </el-select>
+              <el-form-item  style="margin-bottom: 0px;" :prop="'tableData.' + scope.$index + '.ContractNo'" :rules="rules.ContractNo">
+                <el-input v-if="scope.row.ContractNo == ''" size="mini" v-model="scope.row.ContractNo" style="width:100%" placeholder="请输入"></el-input>
+                <el-input v-else size="mini" v-model="scope.row.ContractNo" style="width:100%" placeholder="请输入" readonly></el-input>
               </el-form-item>
             </template>
           </el-table-column>
+          <!--          <el-table-column  prop="Status"  min-width="120" label="选择合同状态" align="center" show-overflow-tooltip >-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-form-item  style="margin-bottom: 0px;" :prop="'tableData.' + scope.$index + '.Status'" :rules="rules.Status">-->
+<!--                <el-select size="mini" v-model="scope.row.Status" placeholder="请选择" style="width: 100%" @change="allUpdate(scope.row.Status,'','Status',scope.row.Id, scope.row.SupplierId)">-->
+<!--                  <el-option label="未履行" :value="1" key="01"></el-option>-->
+<!--                  <el-option label="履行中" :value="2" key="02"></el-option>-->
+<!--                  <el-option label="已完结" :value="3" key="03"></el-option>-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column  prop="SettleStatus"  min-width="110" label="结算状态" align="center" show-overflow-tooltip >-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-form-item  style="margin-bottom: 0px;" :prop="'tableData.' + scope.$index + '.SettleStatus'" :rules="rules.SettleStatus">-->
+<!--                <el-select size="mini" v-model="scope.row.SettleStatus" placeholder="请选择" style="width: 100%" @change="allUpdate(scope.row.SettleStatus,'','SettleStatus',scope.row.Id, scope.row.SupplierId)">-->
+<!--                  <el-option label="未结算" value="1" key="01"></el-option>-->
+<!--                  <el-option label="阶段性结算" value="2" key="02"></el-option>-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+          <el-table-column  prop="ContractName"  min-width="110" label="合同名称" align="center" show-overflow-tooltip></el-table-column>
+          <el-table-column  prop="Amount"  min-width="110" label="标的金额" align="center" show-overflow-tooltip></el-table-column>
           <el-table-column  prop="ImportSecondUnit"  min-width="150" label="二级单位" align="center" show-overflow-tooltip></el-table-column>
           <el-table-column  prop="SecondUnit"  min-width="150" label="确认二级单位" align="center" show-overflow-tooltip>
             <template slot-scope="scope">
@@ -387,22 +392,20 @@
               <el-button size="mini" type="primary" @click="allUpdate(scope.row.SecondUnit,scope.row.ImportSecondUnit,'SecondUnit',0,scope.row.SupplierId)">全部修改</el-button>
             </template>
           </el-table-column>
-           <el-table-column  prop="ContractName"  min-width="110" label="合同名称" align="center" show-overflow-tooltip></el-table-column>
-           <el-table-column  prop="ContractSonClass"  min-width="110" label="合同子类" align="center" show-overflow-tooltip></el-table-column>
-           <el-table-column  prop="SmallClass"  min-width="110" label="相应小类" align="center" show-overflow-tooltip></el-table-column>
+          <el-table-column  prop="ProjectOwner"  min-width="110" label="项目负责人" align="center" show-overflow-tooltip></el-table-column>
+          <!--           <el-table-column  prop="ContractSonClass"  min-width="110" label="合同子类" align="center" show-overflow-tooltip></el-table-column>-->
+<!--           <el-table-column  prop="SmallClass"  min-width="110" label="相应小类" align="center" show-overflow-tooltip></el-table-column>-->
            <el-table-column  prop="SignedDate"  min-width="110" label="签订日期" align="center" show-overflow-tooltip>
              <template slot-scope="scope">
                {{ jstimehandle(scope.row.SignedDate+'') }}
              </template>
            </el-table-column>
 <!--           <el-table-column  prop="People"  min-width="110" label="相对人" align="center" show-overflow-tooltip></el-table-column>-->
-           <el-table-column  prop="Number"  min-width="110" label="报审序号" align="center" show-overflow-tooltip></el-table-column>
-           <el-table-column  prop="ChooseWay"  min-width="110" label="选商方式" align="center" show-overflow-tooltip></el-table-column>
-           <el-table-column  prop="Amount"  min-width="110" label="标的金额" align="center" show-overflow-tooltip></el-table-column>
-           <el-table-column  prop="BudgetAmount"  min-width="110" label="预算金额" align="center" show-overflow-tooltip></el-table-column>
-           <el-table-column  prop="ContractMark"  min-width="110" label="合同标的" align="center" show-overflow-tooltip></el-table-column>
-           <el-table-column  prop="Currency"  min-width="110" label="币种" align="center" show-overflow-tooltip></el-table-column>
-           <el-table-column  prop="DisputeResolution"  min-width="110" label="纠纷解决方式" align="center" show-overflow-tooltip></el-table-column>
+<!--           <el-table-column  prop="ChooseWay"  min-width="110" label="选商方式" align="center" show-overflow-tooltip></el-table-column>-->
+<!--           <el-table-column  prop="BudgetAmount"  min-width="110" label="预算金额" align="center" show-overflow-tooltip></el-table-column>-->
+<!--           <el-table-column  prop="ContractMark"  min-width="110" label="合同标的" align="center" show-overflow-tooltip></el-table-column>-->
+<!--           <el-table-column  prop="Currency"  min-width="110" label="币种" align="center" show-overflow-tooltip></el-table-column>-->
+<!--           <el-table-column  prop="DisputeResolution"  min-width="110" label="纠纷解决方式" align="center" show-overflow-tooltip></el-table-column>-->
           <el-table-column  prop="StartDate"  min-width="110" label="履行期限(始)" align="center" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ jstimehandle(scope.row.StartDate+'') }}
@@ -413,46 +416,46 @@
               {{ jstimehandle(scope.row.EndDate+'') }}
             </template>
           </el-table-column>
-           <el-table-column  prop="IsDeal"  min-width="110" label="是否关联交易" align="center" show-overflow-tooltip>
-             <template slot-scope="scope">
-               <el-select placeholder="请选择" v-model="scope.row.IsDeal" style="width: 100%" size="mini">
-                 <el-option :key="1" label="是" :value="1"></el-option>
-                 <el-option :key="0" label="否" :value="0"></el-option>
-               </el-select>
-             </template>
-           </el-table-column>
-           <el-table-column  prop="IsForeign"  min-width="110" label="是否涉外合同" align="center" show-overflow-tooltip>
-             <template slot-scope="scope">
-               <el-select placeholder="请选择" v-model="scope.row.IsForeign" style="width: 100%" size="mini">
-                 <el-option :key="1" label="是" :value="1"></el-option>
-                 <el-option :key="0" label="否" :value="0"></el-option>
-               </el-select>
-             </template>
-           </el-table-column>
-           <el-table-column  prop="IsInternal"  min-width="110" label="是否内部合同" align="center" show-overflow-tooltip>
-             <template slot-scope="scope">
-               <el-select placeholder="请选择" v-model="scope.row.IsInternal" style="width: 100%" size="mini">
-                 <el-option :key="1" label="是" :value="1"></el-option>
-                 <el-option :key="0" label="否" :value="0"></el-option>
-               </el-select>
-             </template>
-           </el-table-column>
-           <el-table-column  prop="MoneyChannel"  min-width="110" label="资金渠道" align="center" show-overflow-tooltip></el-table-column>
-           <el-table-column  prop="MoneyChannelSmall"  min-width="110" label="资金渠道小类" align="center" show-overflow-tooltip></el-table-column>
-           <el-table-column  prop="MoneyChannelSon"  min-width="110" label="资金渠道子类" align="center" show-overflow-tooltip></el-table-column>
-           <el-table-column  prop="MoneyFlows"  min-width="110" label="资金流向" align="center" show-overflow-tooltip></el-table-column>
-           <el-table-column  prop="PerformAmount"  min-width="110" label="履行金额" align="center" show-overflow-tooltip></el-table-column>
-           <el-table-column  prop="Place"  min-width="110" label="履行地点" align="center" show-overflow-tooltip></el-table-column>
-           <el-table-column  prop="PoNumber"  min-width="110" label="PO编码" align="center" show-overflow-tooltip></el-table-column>
-           <el-table-column  prop="ProjectOwner"  min-width="110" label="项目负责人" align="center" show-overflow-tooltip></el-table-column>
-           <el-table-column  prop="Remark"  min-width="110" label="备注" align="center" show-overflow-tooltip></el-table-column>
-           <el-table-column  prop="SealName"  min-width="110" label="用章名称" align="center" show-overflow-tooltip></el-table-column>
-           <el-table-column  prop="SingUnit"  min-width="110" label="签约单位" align="center" show-overflow-tooltip></el-table-column>
-           <el-table-column  prop="SubmitDate"  min-width="110" label="提交日期" align="center" show-overflow-tooltip>
-             <template slot-scope="scope">
-               {{ jstimehandle(scope.row.SubmitDate+'') }}
-             </template>
-           </el-table-column>
+          <el-table-column  prop="Number"  min-width="110" label="报审序号" align="center" show-overflow-tooltip></el-table-column>
+          <!--           <el-table-column  prop="IsDeal"  min-width="110" label="是否关联交易" align="center" show-overflow-tooltip>-->
+<!--             <template slot-scope="scope">-->
+<!--               <el-select placeholder="请选择" v-model="scope.row.IsDeal" style="width: 100%" size="mini">-->
+<!--                 <el-option :key="1" label="是" :value="1"></el-option>-->
+<!--                 <el-option :key="0" label="否" :value="0"></el-option>-->
+<!--               </el-select>-->
+<!--             </template>-->
+<!--           </el-table-column>-->
+<!--           <el-table-column  prop="IsForeign"  min-width="110" label="是否涉外合同" align="center" show-overflow-tooltip>-->
+<!--             <template slot-scope="scope">-->
+<!--               <el-select placeholder="请选择" v-model="scope.row.IsForeign" style="width: 100%" size="mini">-->
+<!--                 <el-option :key="1" label="是" :value="1"></el-option>-->
+<!--                 <el-option :key="0" label="否" :value="0"></el-option>-->
+<!--               </el-select>-->
+<!--             </template>-->
+<!--           </el-table-column>-->
+<!--           <el-table-column  prop="IsInternal"  min-width="110" label="是否内部合同" align="center" show-overflow-tooltip>-->
+<!--             <template slot-scope="scope">-->
+<!--               <el-select placeholder="请选择" v-model="scope.row.IsInternal" style="width: 100%" size="mini">-->
+<!--                 <el-option :key="1" label="是" :value="1"></el-option>-->
+<!--                 <el-option :key="0" label="否" :value="0"></el-option>-->
+<!--               </el-select>-->
+<!--             </template>-->
+<!--           </el-table-column>-->
+<!--           <el-table-column  prop="MoneyChannel"  min-width="110" label="资金渠道" align="center" show-overflow-tooltip></el-table-column>-->
+<!--           <el-table-column  prop="MoneyChannelSmall"  min-width="110" label="资金渠道小类" align="center" show-overflow-tooltip></el-table-column>-->
+<!--           <el-table-column  prop="MoneyChannelSon"  min-width="110" label="资金渠道子类" align="center" show-overflow-tooltip></el-table-column>-->
+<!--           <el-table-column  prop="MoneyFlows"  min-width="110" label="资金流向" align="center" show-overflow-tooltip></el-table-column>-->
+<!--           <el-table-column  prop="PerformAmount"  min-width="110" label="履行金额" align="center" show-overflow-tooltip></el-table-column>-->
+<!--           <el-table-column  prop="Place"  min-width="110" label="履行地点" align="center" show-overflow-tooltip></el-table-column>-->
+<!--           <el-table-column  prop="PoNumber"  min-width="110" label="PO编码" align="center" show-overflow-tooltip></el-table-column>-->
+<!--           <el-table-column  prop="Remark"  min-width="110" label="备注" align="center" show-overflow-tooltip></el-table-column>-->
+<!--           <el-table-column  prop="SealName"  min-width="110" label="用章名称" align="center" show-overflow-tooltip></el-table-column>-->
+<!--           <el-table-column  prop="SingUnit"  min-width="110" label="签约单位" align="center" show-overflow-tooltip></el-table-column>-->
+<!--           <el-table-column  prop="SubmitDate"  min-width="110" label="提交日期" align="center" show-overflow-tooltip>-->
+<!--             <template slot-scope="scope">-->
+<!--               {{ jstimehandle(scope.row.SubmitDate+'') }}-->
+<!--             </template>-->
+<!--           </el-table-column>-->
 
           </el-table>
         <el-pagination @size-change="handleSizeChange1" @current-change="handleCurrentChange1" :current-page="currentPage1"