后端: 合同评价 合同状态和结算状态的设置及查询

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

@@ -57,6 +57,26 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="8">
+            <el-form-item label="合同状态" prop="Status">
+              <el-select v-model="formData.Status" placeholder="请选择" style="width: 100%">
+                <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>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="结算状态" prop="SettleStatus">
+              <el-select v-model="formData.SettleStatus" placeholder="请选择" style="width: 100%">
+                <el-option label="未结算" value="1" key="1"></el-option>
+                <el-option label="阶段性结算" value="2" key="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="8">
             <el-form-item label="工程地点" prop="ProjectPlace">
               <el-input v-model="formData.ProjectPlace" placeholder="请输入" style="width: 100%"></el-input>
@@ -644,6 +664,8 @@ export default {
         Id: '',
         SupplierId: '',
         SupplierName: '',
+        Status: '',
+        SettleStatus: '',
         ProjectName: '',
         ContractNo: '',
         ProjectPlace: '',

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

@@ -19,6 +19,24 @@
           <!-- <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">
+          <el-form-item label="企业名称">
+            <el-input size="mini" clearable v-model="searchForm.SupplierName" 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="上报时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
@@ -277,7 +295,8 @@
              </template>
            </el-table-column>
            <el-table-column  prop="SourceContractClass"  min-width="110" label="合同类别" align="center" show-overflow-tooltip></el-table-column>
-           <el-table-column  prop="ContractClass"  min-width="110" label="选择合同类别" align="center" show-overflow-tooltip >
+           <el-table-column  prop="ContractClass"  min-width="120" label="选择合同类别" align="center" show-overflow-tooltip >
+             <template slot="header" slot-scope="scope">选择合同类别&nbsp;&nbsp;<i @click="batchSetConClass" class="el-icon-arrow-down" style="cursor: pointer;"></i> </template>
              <template slot-scope="scope">
                 <el-form-item  style="margin-bottom: 0px;" :prop="'tableData.' + scope.$index + '.ContractClass'" :rules="rules.ContractClass">
                   <el-select size="small" v-model="scope.row.ContractClass" placeholder="请选择" style="width: 100%" >
@@ -288,6 +307,29 @@
                 </el-form-item>
              </template>
            </el-table-column>
+          <el-table-column  prop="Status"  min-width="120" label="选择合同状态" align="center" show-overflow-tooltip >
+            <template slot="header" slot-scope="scope">选择合同状态&nbsp;&nbsp;<i @click="batchSetStatus" class="el-icon-arrow-down" style="cursor: pointer;"></i> </template>
+            <template slot-scope="scope">
+              <el-form-item  style="margin-bottom: 0px;" :prop="'tableData.' + scope.$index + '.Status'" :rules="rules.Status">
+                <el-select size="small" v-model="scope.row.Status" placeholder="请选择" style="width: 100%" >
+                  <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="header" slot-scope="scope">结算状态&nbsp;&nbsp;<i @click="batchSetSettleStatus" class="el-icon-arrow-down" style="cursor: pointer;"></i> </template>
+            <template slot-scope="scope">
+              <el-form-item  style="margin-bottom: 0px;" :prop="'tableData.' + scope.$index + '.SettleStatus'" :rules="rules.SettleStatus">
+                <el-select size="small" v-model="scope.row.SettleStatus" placeholder="请选择" style="width: 100%" >
+                  <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="SecondUnit"  min-width="110" label="二级单位" align="center" show-overflow-tooltip>
             <template slot="header" slot-scope="scope">二级单位&nbsp;&nbsp;<i @click="batchSetSecUnit" class="el-icon-arrow-down" style="cursor: pointer;"></i> </template>
             <template slot-scope="scope">
@@ -408,6 +450,19 @@
           } else if (name === 'OpenDate' || name === 'EndDate' || name === 'PlanFinishDate' || name === 'SubmitDate') {
             let timeString = this.timeStyle(item)
             return timeString
+          } else if (name === 'SettleStatus') {
+            var items = Number(item)
+            switch (items) {
+              case 1:
+                return '未结算'
+                break
+              case 2:
+                return '阶段性结算'
+                break
+              default:
+                console.log('什么啊a ', items)
+                return '--'
+            }
           } else {
             return item
           }
@@ -486,6 +541,8 @@
           SupplierId: '',
           SupplierName: '',
           ProjectName: '',
+          Status: '',
+          SettleStatus: '',
           ContractNo: '',
           ProjectPlace: '',
           ProjectOwner: '',
@@ -521,6 +578,8 @@
           Id: '',
           SupplierId: '',
           SupplierName: '',
+          Status: '',
+          SettleStatus: '',
           ProjectName: '',
           ContractNo: '',
           ProjectPlace: '',
@@ -605,6 +664,12 @@
             width: 100,
             sort: true
           },
+          {
+            prop: 'SettleStatus',
+            label: '结算状态',
+            width: 100,
+            sort: true
+          },
           {
             prop: 'ContractClass',
             label: '项目类别',
@@ -878,6 +943,15 @@
           }
         })
       },
+      batchSetConClass () {
+        let that = this
+        let selectedClass = that.tableDataList.tableData[0].ContractClass
+        if (selectedClass) {
+          that.tableDataList.tableData.forEach((item, index) => {
+            that.$set(that.tableDataList.tableData[index], 'ContractClass', selectedClass)
+          })
+        }
+      },
       batchSetSecUnit () {
         let that = this
         let selectedId = that.tableDataList.tableData[0].SecondUnit
@@ -887,6 +961,24 @@
           })
         }
       },
+      batchSetStatus () {
+        let that = this
+        let selectedStatus = that.tableDataList.tableData[0].Status
+        if (selectedStatus) {
+          that.tableDataList.tableData.forEach((item, index) => {
+            that.$set(that.tableDataList.tableData[index], 'Status', selectedStatus)
+          })
+        }
+      },
+      batchSetSettleStatus () {
+        let that = this
+        let selectedStatus = that.tableDataList.tableData[0].SettleStatus
+        if (selectedStatus) {
+          that.tableDataList.tableData.forEach((item, index) => {
+            that.$set(that.tableDataList.tableData[index], 'SettleStatus', selectedStatus)
+          })
+        }
+      },
       // 状态判断
       statusFun () {
         let data = {