bug修改完成 9.29

src/dashoo.cn/frontend_web/nuxt.config.js

@@ -172,9 +172,9 @@ module.exports = {
 
   axios: {
     // baseURL: '//192.168.1.44:10091/api/' // 本机开发使用
-     baseURL: '//localhost:10091/api/' // 本机开发使用
+     // baseURL: '//localhost:10091/api/' // 本机开发使用
     // baseURL: '//192.168.1.41:10091/api/' // 本机开发使用
-    // baseURL: '//192.168.124.13:10091/api/' // 本机开发使用
+    baseURL: '//192.168.124.13:10091/api/' // 本机开发使用
 
     /* --------Nuxt Start发版用 START-------------- */
     // baseURL: '/api/'

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

@@ -19,10 +19,10 @@
            <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='3'&&auditBtn" @click="commonAuditClick(3)">专业处室分办</el-button>
            <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='2'&&auditBtn" @click="commonAuditClick(2)">复审</el-button>
            <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='1'&&auditBtn" @click="commonAuditClick(1)">初审</el-button>
-           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='0'&&formData.Id!=0&&checkBoolean" @click="commonAuditClick(0)">提交审核</el-button>
+           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="Number(formData.Status)<=0&&formData.Id!=0&&checkBoolean" @click="commonAuditClick(0)">提交审核</el-button>
 
 
-          <el-button type="primary" size="mini" v-if="formData.Status=='0'||(formData.Status=='4'&&auditBtn)" @click="saveEntity">保存</el-button>
+          <el-button type="primary" size="mini" v-if="Number(formData.Status)<=0||(formData.Status=='4'&&auditBtn)" @click="saveEntity">保存</el-button>
           <el-button @click="onBack" type="primary" size="mini" style="margin-left: 8px">返回</el-button>
         </span>
       </div>

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

@@ -145,20 +145,19 @@
           Type:2,
         }
         api.contractEvaluationTree(data,this.$axios).then(res => {
-          console.log('编辑后的内容aaaaaaaaaaaaaaaaa',res)
           var data = res.data.items
           var list = []
           for(var index = 0 ; index < data.length ; index++){
             data[index].typeStatus = index
             data[index].Value = data[index].Value==undefined||data[index].Value==''?'0':data[index].Value
             list.push(data[index])
-            if(data[index].Son!=null&&data[index].Son!=undefined){
-              for(var k = 0 ; k < data[index].Son.length ; k++){
-                data[index].Son[k].typeStatus = index
-                data[index].Son[k].Value = data[index].Son[k].Value==undefined||data[index].Son[k].Value==''?'0':data[index].Value
-                list.push(data[index].Son[k])
-              }
-            }
+            // if(data[index].Son!=null&&data[index].Son!=undefined){
+            //   for(var k = 0 ; k < data[index].Son.length ; k++){
+            //     data[index].Son[k].typeStatus = index
+            //     data[index].Son[k].Value = data[index].Son[k].Value==undefined||data[index].Son[k].Value==''?'0':data[index].Value
+            //     list.push(data[index].Son[k])
+            //   }
+            // }
           }
           this.entityListData.entityList = list
           console.log('处理完的数据',list)

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

@@ -364,7 +364,6 @@
           this.evaluation_list = this.$refs.evaluation_list_two.entityListData.entityList
           var list = this.evaluation_list
           for(var i = 0; i < list.length ; i++){
-            console.log(Number(list[i].Score) ,Number(list[i].NormalScore))
             if(Number(list[i].Score) > Number(list[i].NormalScore)){
               this.$message.error('业绩评价填写的分数不能大于标准分值');
               return
@@ -385,8 +384,12 @@
       },
       //专业处室评价
       majorEvaluate(){
-        var formData = this.evaluation_list
-        api.saveSecEvaluation(this.formData.Id,formData, this.$axios).then(res => {
+        // var formData = this.evaluation_list
+
+        var data = {
+          Items:this.evaluation_list,
+        }
+        api.saveSecEvaluation(this.formData.Id,data, this.$axios).then(res => {
           console.log('新增',res)
           if(res.data.code==0){
             this.$message({

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

@@ -301,7 +301,7 @@
         }
         this.standardNum = 0
         api.contractEvaluationTree(data,this.$axios).then(res => {
-          console.log('编辑后的内容',res)
+          console.log('编辑后的内容',this.category,res)
           var data = res.data.items
           var list = []
           for(var index = 0 ; index < data.length ; index++){

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

@@ -19,16 +19,16 @@
            <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='3'&&auditBtn" @click="commonAuditClick(3)">专业处室分办</el-button>
            <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='2'&&auditBtn" @click="commonAuditClick(2)">复审</el-button>
            <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='1'&&auditBtn" @click="commonAuditClick(1)">初审</el-button>
-           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='0'&&formData.Id!=0&&checkBoolean" @click="commonAuditClick(0)">提交审核</el-button>
+           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="Number(formData.Status)<=0&&formData.Id!=0&&checkBoolean" @click="commonAuditClick(0)">提交审核</el-button>
 
 
-          <el-button type="primary" size="mini" v-if="formData.Status=='0'||(formData.Status=='4'&&auditBtn)" @click="saveEntity">保存</el-button>
+          <el-button type="primary" size="mini" v-if="Number(formData.Status)<=0||(formData.Status=='4'&&auditBtn)" @click="saveEntity">保存</el-button>
           <el-button @click="onBack" type="primary" size="mini" style="margin-left: 8px">返回</el-button>
         </span>
       </div>
       <el-tabs v-model="activeName" style="margin-top: -10px">
         <!-- 普通 -->
-        <el-tab-pane label="评价信息" name="1">
+        <el-tab-pane label="评价信息" name="1" >
           <el-card class="box-card" style="mini-height: calc(100vh - 113px);">
             <el-form label-width="160px" ref="EntityForm" :model="evaluateData" :rules="rules">
               <el-row>
@@ -92,12 +92,12 @@
           </el-card>
         </el-tab-pane>
         <!-- 普通 -->
-        <el-tab-pane label="条件评价" name="2" >
+        <el-tab-pane label="条件评价" name="2" v-if="formData.ContractClass=='02'">
           <baseList ref="evaluateDataRef" :baseData="evaluateData" :evaluateId="formData.Id" :category="0" :ContractClass="formData.ContractClass" :disabledForm="auditBtnBoolean"></baseList>
         </el-tab-pane>
 
         <!-- 专业处室 -->
-        <el-tab-pane label="专业处室评价信息" name="3" v-if="departmentBoolean&&formData.ContractClass=='02'">
+        <el-tab-pane label="专业处室评价信息" name="3" v-if="departmentBoolean">
           <el-card class="box-card" style="mini-height: calc(100vh - 113px);">
             <el-form label-width="160px" ref="EntityForm" :model="evaluateDataZhuan" :rules="rules">
               <el-row>
@@ -354,7 +354,7 @@
         }).catch(err => {
           console.error(err)
         })
-        
+
       },
       //刷新数据接口
       refreshPage(){

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

@@ -181,6 +181,7 @@
 <script>
   import { mapGetters } from 'vuex';
   import api from '@/api/oilcontract/contract';
+  import apiReview from '@/api/oilcontract/contractReview';
   import permissionApi from '@/api/oilcontract/permission';
   import FileSaver from 'file-saver'
   import XLSX from 'xlsx'
@@ -537,9 +538,9 @@
         this.currentPage = 1
         this.initDatas()
       },
-      deleteEntity(row) {
+      deleteEntity(row,index) {
         this.$refs['popover-' + `${index}`].doClose()
-        api.deleteEntity(row.Id, this.$axios).then(res => {
+        apiReview.deleteEntity(row.Id, this.$axios).then(res => {
           if (res.data.code === 0) {
             this.initDatas();
             this.$message({

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

@@ -19,10 +19,10 @@
            <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='3'&&auditBtn" @click="commonAuditClick(3)">专业处室分办</el-button>
            <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='2'&&auditBtn" @click="commonAuditClick(2)">复审</el-button>
            <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='1'&&auditBtn" @click="commonAuditClick(1)">初审</el-button>
-           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='0'&&formData.Id!=0&&checkBoolean" @click="commonAuditClick(0)">提交审核</el-button>
+           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="Number(formData.Status)<=0&&formData.Id!=0&&checkBoolean" @click="commonAuditClick(0)">提交审核</el-button>
 
 
-          <el-button type="primary" size="mini" v-if="formData.Status=='0'||(formData.Status=='4'&&auditBtn)" @click="saveEntity">保存</el-button>
+          <el-button type="primary" size="mini" v-if="Number(formData.Status)<=0||(formData.Status=='4'&&auditBtn)" @click="saveEntity">保存</el-button>
           <el-button @click="onBack" type="primary" size="mini" style="margin-left: 8px">返回</el-button>
         </span>
       </div>

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

@@ -182,6 +182,7 @@
 <script>
   import { mapGetters } from 'vuex';
   import api from '@/api/oilcontract/contract';
+  import apiReview from '@/api/oilcontract/contractReview';
   import permissionApi from '@/api/oilcontract/permission';
   import FileSaver from 'file-saver'
   import XLSX from 'xlsx'
@@ -541,7 +542,7 @@
       },
       deleteEntity(row,index) {
         this.$refs['popover-' + `${index}`].doClose()
-        api.deleteEntity(row.Id, this.$axios).then(res => {
+        apiReview.deleteEntity(row.Id, this.$axios).then(res => {
           if (res.data.code === 0) {
             this.initDatas();
             this.$message({

src/dashoo.cn/frontend_web/src/pages/oilcontract/evaluation-items/baselist.vue

@@ -15,16 +15,57 @@
       </el-table-column>
       <el-table-column
         property="Value"
-        label="是否满足"
+        label="操作"
         header-align="center"
         align="center"
         width="100">
         <template slot-scope="scope">
-          <el-button size="mini" :disabled="!disabledForm" type="success" v-if="Number(scope.row.Value)>0" @click="entityListData.entityList[scope.$index].Value=0">是</el-button>
-          <el-button size="mini" :disabled="!disabledForm" type="danger" v-else @click="entityListData.entityList[scope.$index].Value=1">否</el-button>
+          <el-button slot="reference" type="text"  icon="el-icon-edit" size="small" @click="onDialogVisible(scope.row,scope.$index)">编辑</el-button>
+          <el-popover placement="top" title="提示" :ref="'popover-' + `${scope.$index}`">
+            <el-alert
+              title=""
+              description="确认要删除吗？"
+              type="warning"
+              :closable="false">
+            </el-alert>
+            <br/>
+            <div style="text-align: right; margin: 0">
+              <el-button type="primary" size="mini" @click="deleteEntity(scope.row,scope.$index)">删除</el-button>
+            </div>
+            <el-button slot="reference"  type="text" style="margin-left:3px" icon="el-icon-delete" size="small" >删除</el-button>
+          </el-popover>
         </template>
       </el-table-column>
     </el-table>
+    
+    
+    <el-dialog
+      title="编辑"
+      :visible.sync="dialogBoolean"
+      width="60%"
+      >
+      <el-form ref="advancedsearchForm" :model="formData" :rules="rulesEve" label-width="110px" class="advancedsearchFormClass">
+        <el-row>
+    
+          <el-col :span="24">
+            <el-form-item label="评价项目" prop="Content">
+              <el-input   type="textarea" placeholder="请输入" v-model="formData.Content" ></el-input>
+            </el-form-item>
+          </el-col>
+    
+    
+        </el-row>
+      </el-form>
+    
+    
+    
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogBoolean = false" size="small" >取 消</el-button>
+        <el-button type="primary" @click="onTrueDialog" size="small">确 定</el-button>
+      </span>
+    </el-dialog>
+    
+    
     <!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
                    :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
     </el-pagination> -->

src/dashoo.cn/frontend_web/src/pages/oilcontract/evaluation-items/evaluationlist.vue

@@ -122,7 +122,7 @@
 <script>
   import { mapGetters } from 'vuex';
   import api from '@/api/oilcontract/contract'
-  // import api from '@/api/oilcontract/contractEvaluationItems';
+  import apiItems from '@/api/oilcontract/contractEvaluationItems';
 
   export default {
     computed: {
@@ -325,12 +325,12 @@
       //编辑初始数据
       editDatas() {
         var data = {
-          ContentReviewId:this.evaluateId,
-          Category:this.category,
-          Type:1,
+          // ContentReviewId:this.evaluateId,
+          // Category:this.category,
+          // Type:1,
         }
         this.standardNum = 0
-        api.contractEvaluationTree(data,this.$axios).then(res => {
+        apiItems.evaluationItemsOnelist(data,this.$axios).then(res => {
           console.log('编辑后的内容',res)
           var data = res.data.items
           var list = []