前后:合同确认企业名称;待确认列表只有企管能看

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

@@ -609,6 +609,7 @@ func (this *OilContractController) ImportExcel() {
 				con.ContractClass = "03"
 			}
 			con.ImportSupplierName = sheet.Rows[i].Cells[1].String()
+			con.SupplierName = con.ImportSupplierName
 			con.ContractNo = sheet.Rows[i].Cells[2].String()
 			con.ContractName = sheet.Rows[i].Cells[3].String()
 			con.Amount = sheet.Rows[i].Cells[4].String()
@@ -629,7 +630,6 @@ func (this *OilContractController) ImportExcel() {
 			svc.GetEntityByWhere(OilSupplierName, "SupplierName = '"+con.ImportSupplierName+"'", &supp)
 			if supp.Id > 0 {
 				con.SupplierId = supp.Id
-				con.SupplierName = supp.SupplierName
 			}
 			var org organize.Base_Organize
 			svc.GetEntityByWhere("Base_Organize", "FullName = '"+sheet.Rows[i].Cells[5].String()+"'", &org)
@@ -735,7 +735,7 @@ func (this *OilContractController) DocExport() {
 // @router /importbatchsave [post]
 func (this *OilContractController) ImportBatchSave() {
 
-	sql := "update OilContract set ImportStatus = 1 where SupplierId != 0 and ContractClass != '' and SecondUnit != 0 and ContractNo != ''"
+	sql := "update OilContract set ImportStatus = 1 where SupplierName != '' and ContractClass != '' and SecondUnit != 0 and ContractNo != ''"
 	_, err := utils.DBE.Query(sql)
 	var errinfo ErrorInfo
 	if err == nil {
@@ -761,6 +761,7 @@ func (this *OilContractController) ImportUpdate() {
 	Column := this.GetString("Column")
 	Id := this.GetString("Id")
 	SupplierId := this.GetString("SupplierId")
+	SupplierName := this.GetString("SupplierName")
 
 	var supp supplier.OilSupplier
 	svc := supplier.GetOilSupplierService(utils.DBE)
@@ -807,6 +808,11 @@ func (this *OilContractController) ImportUpdate() {
 		sql := "update OilContract set SupplierName = '" + supp.SupplierName + "', " + Column + " = " + Value + " where " + where
 		_, err = utils.DBE.Query(sql)
 	}
+	if Column == "SupplierName" {
+		where += " and Id = " + Id + " and ImportStatus = 0"
+		sql := "update OilContract set SupplierName = '" + SupplierName + "', " + Column + " = " + Value + " where " + where
+		_, err = utils.DBE.Query(sql)
+	}
 	if Column == "SettleStatus" {
 		where += " and Id = " + Id + " and ImportStatus = 0"
 		sql := "update OilContract set SupplierName = '" + supp.SupplierName + "', " + Column + " = '" + Value + "' where " + where

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

@@ -16,7 +16,7 @@
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">添加</el-button>
           </router-link>
           <el-button v-if="importAuditProf" type="primary" size="mini" @click="importExcel" style="margin-left:10px; margin-top: -4px;">导入</el-button>
-          <el-button type="primary" size="mini" @click="importExcelSelect" style="margin-left:10px; margin-top: -4px;">待确认列表</el-button>
+          <el-button v-if="importAuditProf" type="primary" size="mini" @click="importExcelSelect" style="margin-left:10px; margin-top: -4px;">待确认列表</el-button>
           <!-- <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">分发给二级单位评价</el-button> -->
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
@@ -28,7 +28,7 @@
               <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-option label="已完结" :value="3" key="04"></el-option>
             </el-select>
           </el-form-item>
 <!--          <el-form-item label="结算状态" style="width: 180px">-->
@@ -287,17 +287,17 @@
         <el-form-item label="合同编号">
           <el-input size="mini" clearable v-model="searchForm.ContractNo" style="width: 150px;" placeholder="请输入合同编号"></el-input>
         </el-form-item>
-        <el-form-item label="二级单位">
-          <el-input size="mini" clearable v-model="searchForm.ImportUnitName" style="width: 150px;" placeholder="请输入二级单位"></el-input>
+        <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: 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>-->
@@ -347,6 +347,11 @@
               </el-form-item>
               <el-button size="mini" type="primary" @click="allUpdate(scope.row.SupplierId,scope.row.ImportSupplierName,'SupplierId', 0, scope.row.SupplierId)">全部修改</el-button>
             </template>
+<!--            <template slot-scope="scope">-->
+<!--              <el-form-item  style="margin-bottom: 0px;" :prop="'tableData.' + scope.$index + '.SupplierName'" :rules="rules.SupplierName">-->
+<!--                <el-input size="mini" v-model="scope.row.SupplierName" style="width:100%" placeholder="请输入"></el-input>-->
+<!--              </el-form-item>-->
+<!--            </template>-->
           </el-table-column>
           <el-table-column  prop="ContractNo"  min-width="200" label="合同编号" align="center" show-overflow-tooltip>
             <template slot-scope="scope">
@@ -356,17 +361,6 @@
               </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">-->
@@ -379,8 +373,8 @@
           <!--          </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>
+          <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">
               <el-form-item  style="margin-bottom: 0px;" :prop="'tableData.' + scope.$index + '.SecondUnit'" :rules="rules.SecondUnit">
                 <el-select filterable size="mini" v-model="scope.row.SecondUnit" placeholder="请选择" style="width: 100%" @change="allUpdate(scope.row.SecondUnit,scope.row.ImportSecondUnit,'SecondUnit', scope.row.Id, scope.row.SupplierId)">
@@ -417,6 +411,17 @@
             </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="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="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">-->
@@ -786,7 +791,7 @@
           },
           {
             prop: 'SecondUnitName',
-            label: '二级单位',
+            label: '项目建设单位',
             width: 100,
             sort: true
           },
@@ -805,7 +810,7 @@
           },
           {
             prop: 'Status',
-            label: '合同状态',
+            label: '履行状态',
             width: 100,
             sort: true
           },