前后:文案

src/dashoo.cn/backend/api/business/oilcontract/contractReview/contractReview.go

@@ -56,6 +56,7 @@ type OilContractReviewListVo struct {
 
 	SupplierName   string    `json:"SupplierName"` // 供应商名称
 	ProjectName    string    `json:"ProjectName"`  // 项目名称
+	ContractName   string    `json:"ContractName"`  // 合同名称
 	ContractNo     string    `json:"ContractNo"`   // 合同编号
 	SupplierId     int       `json:"SupplierId"`
 	ProjectPlace   string    `json:"ProjectPlace"`

src/dashoo.cn/backend/api/business/oilcontract/contractReview/contractReviewService.go

@@ -28,6 +28,7 @@ func (s *OilContractReviewService) GetContractReviewList(pageIndex, itemsPerPage
 
 	sql := "SELECT r.*,c.SupplierName,c.ProjectName,c.ContractNo,c.SupplierId " +
 		",c.ProjectPlace" +
+		",c.ContractName" +
 		",c.ProjectOwner" +
 		",c.Telephone" +
 		",c.ProjectType" +

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

@@ -49,6 +49,7 @@ func (this *OilContractReviewController) GetEntityList() {
 	}
 	Id := this.GetString("Id")
 	ContractClass := this.GetString("ContractClass")
+	ContractName := this.GetString("ContractName")
 	ContractId := this.GetString("ContractId")
 	WorkflowId := this.GetString("WorkflowId")
 	BusinessKey := this.GetString("BusinessKey")
@@ -91,6 +92,10 @@ func (this *OilContractReviewController) GetEntityList() {
 		where = where + " and c.SupplierName like '%" + SupplierName + "%'"
 	}
 
+	if ContractName != "" {
+		where = where + " and c.ContractName like '%" + ContractName + "%'"
+	}
+
 	if Status != "" {
 		where = where + " and r.Status=" + Status
 	}

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

@@ -121,8 +121,8 @@
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="项目名称">
-              <el-input size="mini" v-model="searchForm.ProjectName" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="合同名称">
+              <el-input size="mini" v-model="searchForm.ContractName" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -353,6 +353,7 @@ export default {
         SupplierName: '',
         ProjectName: '',
         ContractNo: '',
+        ContractName: '',
         ProjectPlace: '',
         ProjectOwner: '',
         Telephone: '',
@@ -409,8 +410,8 @@ export default {
         },
 
         {
-          prop: 'ProjectName',
-          label: '项目名称',
+          prop: 'ContractName',
+          label: '合同名称',
           width: 100,
           sort: true
         },

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

@@ -123,8 +123,8 @@
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="项目名称">
-              <el-input size="mini" v-model="searchForm.ProjectName" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="合同名称">
+              <el-input size="mini" v-model="searchForm.ContractName" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -346,6 +346,7 @@ export default {
         Id: '',
         SupplierId: '',
         SupplierName: '',
+        ContractName: '',
         ProjectName: '',
         ContractNo: '',
         ProjectPlace: '',
@@ -404,8 +405,8 @@ export default {
         },
 
         {
-          prop: 'ProjectName',
-          label: '项目名称',
+          prop: 'ContractName',
+          label: '合同名称',
           width: 100,
           sort: true
         },

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

@@ -126,8 +126,8 @@
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="项目名称">
-              <el-input size="mini" v-model="searchForm.ProjectName" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="合同名称">
+              <el-input size="mini" v-model="searchForm.ContractName" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
 
@@ -356,8 +356,7 @@
           <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-input size="mini" v-model="scope.row.ContractNo" style="width:100%" placeholder="请输入" @blur="allUpdate(scope.row.SupplierId,scope.row.ImportSupplierName,'ContractNo',scope.row.Id, scope.row.SupplierId)""></el-input>
               </el-form-item>
             </template>
           </el-table-column>
@@ -675,6 +674,7 @@
           Id: '',
           SupplierId: '',
           SupplierName: '',
+          ContractName: '',
           ProjectName: '',
           Status: '',
           SettleStatus: '',
@@ -796,12 +796,12 @@
             sort: true
           },
 
-          // {
-          //   prop: 'ProjectName',
-          //   label: '项目名称',
-          //   width: 100,
-          //   sort: true
-          // },
+          {
+            prop: 'ContractName',
+            label: '合同名称',
+            width: 100,
+            sort: true
+          },
           {
             prop: 'ClassName',
             label: '合同类别',

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

@@ -123,8 +123,8 @@
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="项目名称">
-              <el-input size="mini" v-model="searchForm.ProjectName" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="合同名称">
+              <el-input size="mini" v-model="searchForm.ContractName" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -348,6 +348,7 @@ export default {
         Id: '',
         SupplierId: '',
         SupplierName: '',
+        ContractName: '',
         ProjectName: '',
         ContractNo: '',
         ProjectPlace: '',
@@ -406,8 +407,8 @@ export default {
         },
 
         {
-          prop: 'ProjectName',
-          label: '项目名称',
+          prop: 'ContractName',
+          label: '合同名称',
           width: 100,
           sort: true
         },

src/dashoo.cn/frontend_web/src/pages/oilcontract/report/handon-statistics.vue

@@ -14,8 +14,8 @@
           <!-- <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="exportExcel">导出</el-button> -->
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="单位名称">
-            <el-input size="mini" clearable v-model="searchForm.SecondUnit" placeholder="请输入单位名称"></el-input>
+          <el-form-item label="项目建设单位名称">
+            <el-input size="mini" clearable v-model="searchForm.SecondUnit" placeholder="请输入项目建设单位名称"></el-input>
           </el-form-item>
           <el-form-item label="类型" style="width: 170px">
             <el-select size="mini" v-model="searchForm.SupplierType" placeholder="请选择" style="width: 100px">
@@ -43,9 +43,10 @@
       </div>
 
       <el-table id="rebateSetTable" highlight-current-row stripe size="mini" :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby" v-loading="tableLoading">
-        <el-table-column sortable show-overflow-tooltip prop="SecondUnit" header-align="center" align="center" label="单位名称"></el-table-column>
+        <el-table-column sortable show-overflow-tooltip prop="SecondUnit" header-align="center" align="center" label="项目建设单位名称"></el-table-column>
         <el-table-column sortable show-overflow-tooltip prop="ContractNum" header-align="center" label="合同总数" width="150" align="center"></el-table-column>
         <el-table-column sortable show-overflow-tooltip prop="HasNum" header-align="center" label="已上报数" width="150" align="center"></el-table-column>
+        <el-table-column sortable show-overflow-tooltip prop="HasNum" header-align="center" label="已完成数" width="150" align="center"></el-table-column>
         <el-table-column sortable show-overflow-tooltip prop="HasNum" header-align="center" label="未上报数" width="150" align="center">
           <template slot-scope="scope">
             {{ (scope.row.ContractNum - scope.row.HasNum) > 0 ? (scope.row.ContractNum - scope.row.HasNum) : 0 }}