前后:优化

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

@@ -73,6 +73,8 @@ type OilContractReviewListVo struct {
 	PlanFinishDate time.Time `json:"PlanFinishDate"`
 	SettleStatus   string    `json:"SettleStatus"`
 	Remark         string    `json:"Remark"`
+	UnitId         int    	 `json:"SecondUnit"`
+	Unit           string    `json:"SecondUnitName"`
 }
 type OilContractReviewVo struct {
 	Items             []*OilContractEvaluationItemsVo

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

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

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

@@ -119,7 +119,7 @@ func (this *OilContractReviewController) GetEntityList() {
 	if !isauth {
 		// 权限过滤  自己创建的评价 ，同二级部门创建的评价 ，企管法规处能看
 		where = where + " and ( r.CreateUserId =  '" + this.User.Id + "' "
-		where = where + " or r.UnitId = '" + strconv.Itoa(this.User.UnitId) + "' "
+		where = where + " or c.SecondUnit = '" + strconv.Itoa(this.User.UnitId) + "' "
 		where = where + " )"
 	}
 

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

@@ -45,7 +45,7 @@
               <el-option v-for="(item, index) in yearList" :key="index" :label="item" :value="item" style="width: 100%"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="上报时间">
+          <el-form-item label="创建时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
@@ -84,6 +84,17 @@
             </el-button>
           </template>
         </el-table-column>
+        <el-table-column v-for="column in tableColumns" :key="column.Id"
+                         v-if="column.prop === 'Status'" :prop="column.prop" sortable :min-width="140" :label="column.label" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <div>
+              <span v-if="scope.row[column.prop] == 0" style="color: #409EFF">{{ columnFun(scope.row[column.prop], column.prop) }}</span>
+              <span v-else-if="scope.row[column.prop] == 8" style="color: #67C23A">{{ columnFun(scope.row[column.prop], column.prop) }}</span>
+              <span v-else-if="scope.row[column.prop] < 0" style="color: #F56C6C">{{ columnFun(scope.row[column.prop], column.prop) }}</span>
+              <span v-else style="color: #E6A23C">{{ columnFun(scope.row[column.prop], column.prop) }}</span>
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column v-for="column in tableColumns" :key="column.Id"
                          v-if="column.prop == 'SupplierName' || column.prop == 'SecondUnitName' || column.prop == 'ContractName' || column.prop == 'ContractNo'" :prop="column.prop" sortable :min-width="240" :label="column.label" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -91,15 +102,9 @@
           </template>
         </el-table-column>
         <el-table-column v-for="column in tableColumns" :key="column.Id"
-                         v-if="column.prop != 'CreateOn' && column.prop != 'SupplierName' && column.prop != 'SecondUnitName' && column.prop != 'ContractName' && column.prop != 'ContractNo'" :prop="column.prop" sortable :min-width="140" :label="column.label" align="center" show-overflow-tooltip>
+                         v-if="column.prop != 'CreateOn' && column.prop != 'SupplierName' && column.prop != 'SecondUnitName' && column.prop != 'ContractName' && column.prop != 'ContractNo' && column.prop != 'Status'" :prop="column.prop" sortable :min-width="140" :label="column.label" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
-            <div v-if="column.prop !== 'Status'">{{ columnFun(scope.row[column.prop], column.prop) }}</div>
-            <div v-if="column.prop === 'Status'">
-              <span v-if="scope.row[column.prop] == 0" style="color: #409EFF">{{ columnFun(scope.row[column.prop], column.prop) }}</span>
-              <span v-else-if="scope.row[column.prop] == 8" style="color: #67C23A">{{ columnFun(scope.row[column.prop], column.prop) }}</span>
-              <span v-else-if="scope.row[column.prop] < 0" style="color: #F56C6C">{{ columnFun(scope.row[column.prop], column.prop) }}</span>
-              <span v-else style="color: #E6A23C">{{ columnFun(scope.row[column.prop], column.prop) }}</span>
-            </div>
+            <div>{{ columnFun(scope.row[column.prop], column.prop) }}</div>
           </template>
         </el-table-column>
 
@@ -157,17 +162,17 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="项目类别">
-              <el-input size="mini" v-model="searchForm.ProjectType" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="合同模式">
-              <el-input size="mini" v-model="searchForm.ContractMode" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="项目类别">-->
+<!--              <el-input size="mini" v-model="searchForm.ProjectType" style="width:100%" placeholder="请输入"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="合同模式">-->
+<!--              <el-input size="mini" v-model="searchForm.ContractMode" style="width:100%" placeholder="请输入"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
         <el-row>
           <el-col :span="12">
@@ -411,6 +416,12 @@ export default {
           width: 100,
           sort: true
         },
+        {
+          prop: 'SecondUnitName',
+          label: '项目建设单位',
+          width: 100,
+          sort: true
+        },
 
         {
           prop: 'ContractName',
@@ -447,12 +458,12 @@ export default {
           sort: true
         },
 
-        {
-          prop: 'ProjectType',
-          label: '项目类别',
-          width: 100,
-          sort: true
-        },
+        // {
+        //   prop: 'ProjectType',
+        //   label: '项目类别',
+        //   width: 100,
+        //   sort: true
+        // },
 
         // {
         //   prop: 'ContractMode',

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

@@ -45,7 +45,7 @@
               <el-option v-for="(item, index) in yearList" :key="index" :label="item" :value="item" style="width: 100%"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="上报时间">
+          <el-form-item label="创建时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
@@ -83,6 +83,17 @@
             </el-button>
           </template>
         </el-table-column>
+        <el-table-column v-for="column in tableColumns" :key="column.Id"
+                         v-if="column.prop === 'Status'" :prop="column.prop" sortable :min-width="140" :label="column.label" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <div>
+              <span v-if="scope.row[column.prop] == 0" style="color: #409EFF">{{ columnFun(scope.row[column.prop], column.prop) }}</span>
+              <span v-else-if="scope.row[column.prop] == 8" style="color: #67C23A">{{ columnFun(scope.row[column.prop], column.prop) }}</span>
+              <span v-else-if="scope.row[column.prop] < 0" style="color: #F56C6C">{{ columnFun(scope.row[column.prop], column.prop) }}</span>
+              <span v-else style="color: #E6A23C">{{ columnFun(scope.row[column.prop], column.prop) }}</span>
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column v-for="column in tableColumns" :key="column.Id"
                          v-if="column.prop == 'SupplierName' || column.prop == 'SecondUnitName' || column.prop == 'ContractName' || column.prop == 'ContractNo'" :prop="column.prop" sortable :min-width="240" :label="column.label" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -90,15 +101,9 @@
           </template>
         </el-table-column>
         <el-table-column v-for="column in tableColumns" :key="column.Id"
-                         v-if="column.prop != 'CreateOn' && column.prop != 'SupplierName' && column.prop != 'SecondUnitName' && column.prop != 'ContractName' && column.prop != 'ContractNo'" :prop="column.prop" sortable :min-width="140" :label="column.label" align="center" show-overflow-tooltip>
+                         v-if="column.prop != 'CreateOn' && column.prop != 'SupplierName' && column.prop != 'SecondUnitName' && column.prop != 'ContractName' && column.prop != 'ContractNo' && column.prop != 'Status'" :prop="column.prop" sortable :min-width="140" :label="column.label" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
-            <div v-if="column.prop !== 'Status'">{{ columnFun(scope.row[column.prop], column.prop) }}</div>
-            <div v-if="column.prop === 'Status'">
-              <span v-if="scope.row[column.prop] == 0" style="color: #409EFF">{{ columnFun(scope.row[column.prop], column.prop) }}</span>
-              <span v-else-if="scope.row[column.prop] == 8" style="color: #67C23A">{{ columnFun(scope.row[column.prop], column.prop) }}</span>
-              <span v-else-if="scope.row[column.prop] < 0" style="color: #F56C6C">{{ columnFun(scope.row[column.prop], column.prop) }}</span>
-              <span v-else style="color: #E6A23C">{{ columnFun(scope.row[column.prop], column.prop) }}</span>
-            </div>
+            <div>{{ columnFun(scope.row[column.prop], column.prop) }}</div>
           </template>
         </el-table-column>
 
@@ -159,17 +164,17 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="项目类别">
-              <el-input size="mini" v-model="searchForm.ProjectType" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="合同模式">
-              <el-input size="mini" v-model="searchForm.ContractMode" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="项目类别">-->
+<!--              <el-input size="mini" v-model="searchForm.ProjectType" style="width:100%" placeholder="请输入"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="合同模式">-->
+<!--              <el-input size="mini" v-model="searchForm.ContractMode" style="width:100%" placeholder="请输入"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
         <el-row>
           <el-col :span="12">
@@ -407,6 +412,12 @@ export default {
           width: 100,
           sort: true
         },
+        {
+          prop: 'SecondUnitName',
+          label: '项目建设单位',
+          width: 100,
+          sort: true
+        },
 
         {
           prop: 'ContractName',
@@ -443,12 +454,12 @@ export default {
           sort: true
         },
 
-        {
-          prop: 'ProjectType',
-          label: '项目类别',
-          width: 100,
-          sort: true
-        },
+        // {
+        //   prop: 'ProjectType',
+        //   label: '项目类别',
+        //   width: 100,
+        //   sort: true
+        // },
 
         // {
         //   prop: "ContractMode",

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

@@ -45,7 +45,7 @@
               <el-option v-for="(item, index) in yearList" :key="index" :label="item" :value="item" style="width: 100%"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="上报时间">
+          <el-form-item label="创建时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
@@ -83,7 +83,17 @@
             </el-button>
           </template>
         </el-table-column>
-
+        <el-table-column v-for="column in tableColumns" :key="column.Id"
+                         v-if="column.prop === 'Status'" :prop="column.prop" sortable :min-width="140" :label="column.label" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <div>
+              <span v-if="scope.row[column.prop] == 0" style="color: #409EFF">{{ columnFun(scope.row[column.prop], column.prop) }}</span>
+              <span v-else-if="scope.row[column.prop] == 8" style="color: #67C23A">{{ columnFun(scope.row[column.prop], column.prop) }}</span>
+              <span v-else-if="scope.row[column.prop] < 0" style="color: #F56C6C">{{ columnFun(scope.row[column.prop], column.prop) }}</span>
+              <span v-else style="color: #E6A23C">{{ columnFun(scope.row[column.prop], column.prop) }}</span>
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column v-for="column in tableColumns" :key="column.Id"
                          v-if="column.prop == 'SupplierName' || column.prop == 'SecondUnitName' || column.prop == 'ContractName' || column.prop == 'ContractNo'" :prop="column.prop" sortable :min-width="240" :label="column.label" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -91,15 +101,9 @@
           </template>
         </el-table-column>
         <el-table-column v-for="column in tableColumns" :key="column.Id"
-                         v-if="column.prop != 'CreateOn' && column.prop != 'SupplierName' && column.prop != 'SecondUnitName' && column.prop != 'ContractName' && column.prop != 'ContractNo'" :prop="column.prop" sortable :min-width="140" :label="column.label" align="center" show-overflow-tooltip>
+                         v-if="column.prop != 'CreateOn' && column.prop != 'SupplierName' && column.prop != 'SecondUnitName' && column.prop != 'ContractName' && column.prop != 'ContractNo' && column.prop != 'Status'" :prop="column.prop" sortable :min-width="140" :label="column.label" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
-            <div v-if="column.prop !== 'Status'">{{ columnFun(scope.row[column.prop], column.prop) }}</div>
-            <div v-if="column.prop === 'Status'">
-              <span v-if="scope.row[column.prop] == 0" style="color: #409EFF">{{ columnFun(scope.row[column.prop], column.prop) }}</span>
-              <span v-else-if="scope.row[column.prop] == 8" style="color: #67C23A">{{ columnFun(scope.row[column.prop], column.prop) }}</span>
-              <span v-else-if="scope.row[column.prop] < 0" style="color: #F56C6C">{{ columnFun(scope.row[column.prop], column.prop) }}</span>
-              <span v-else style="color: #E6A23C">{{ columnFun(scope.row[column.prop], column.prop) }}</span>
-            </div>
+            <div>{{ columnFun(scope.row[column.prop], column.prop) }}</div>
           </template>
         </el-table-column>
 
@@ -160,17 +164,17 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="项目类别">
-              <el-input size="mini" v-model="searchForm.ProjectType" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="合同模式">
-              <el-input size="mini" v-model="searchForm.ContractMode" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="项目类别">-->
+<!--              <el-input size="mini" v-model="searchForm.ProjectType" style="width:100%" placeholder="请输入"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="合同模式">-->
+<!--              <el-input size="mini" v-model="searchForm.ContractMode" style="width:100%" placeholder="请输入"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
         <el-row>
           <el-col :span="12">
@@ -410,6 +414,12 @@ export default {
           width: 100,
           sort: true
         },
+        {
+          prop: 'SecondUnitName',
+          label: '项目建设单位',
+          width: 100,
+          sort: true
+        },
 
         {
           prop: 'ContractName',
@@ -446,12 +456,12 @@ export default {
           sort: true
         },
 
-        {
-          prop: 'ProjectType',
-          label: '项目类别',
-          width: 100,
-          sort: true
-        },
+        // {
+        //   prop: 'ProjectType',
+        //   label: '项目类别',
+        //   width: 100,
+        //   sort: true
+        // },
 
         // {
         //   prop: "ContractMode",