合同导入提交

src/dashoo.cn/frontend_web/src/api/oilcontract/contract.js

@@ -191,4 +191,12 @@ export default {
       params: params
     })
   },
+  // 保存导入合同
+  saveImportExcel (formData, myAxios) {
+    return myAxios({
+      url: '/contract/importbatchsave',
+      method: 'post',
+      data: formData
+    })
+  },
 }

src/dashoo.cn/frontend_web/src/api/oilsupplier/annualaudit.js

@@ -26,6 +26,12 @@ export default {
       method: 'GET'
     })
   },
+  getSupListCode (myAxios) {
+    return myAxios({
+      url: '/annualaudit/supplierlist',
+      method: 'GET'
+    })
+  },
   getDictList (myAxios) {
     return myAxios({
       url: '/annualaudit/dictlist/',

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

@@ -40,7 +40,7 @@
 
                 <el-col :span="8">
                   <el-form-item label="评价得分" prop="SumScore">
-                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore" ::max="100" :min="0" placeholder="请输入"  style="width: 100%" />
+                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore" :max="100" :min="0" placeholder="请输入"  style="width: 100%" />
                   </el-form-item>
                 </el-col>
 
@@ -99,12 +99,12 @@
                 </el-col>
                 <el-col :span="8" >
                   <el-form-item label="业绩评价结果" prop="Result1">
-                    <el-input  :disabled="!auditBtnBoolean" v-model="evaluateData.Note" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input  :disabled="!auditBtnBoolean" v-model="evaluateData.Result1" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" >
-                  <el-form-item label="基本条件评价结果" prop="Result1">
-                    <el-input  :disabled="!auditBtnBoolean" v-model="evaluateData.Note" placeholder="请输入"  style="width: 100%"></el-input>
+                  <el-form-item label="基本条件评价结果" prop="Result2">
+                    <el-input  :disabled="!auditBtnBoolean" v-model="evaluateData.Result2" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
@@ -187,12 +187,12 @@
                 </el-col>
                 <el-col :span="8" >
                   <el-form-item label="业绩评价结果" prop="Result1">
-                    <el-input  :disabled="!auditBtnBooleanZhuan" v-model="evaluateData.Note" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input  :disabled="!auditBtnBooleanZhuan" v-model="evaluateData.Result1" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" >
-                  <el-form-item label="基本条件评价结果" prop="Result1">
-                    <el-input  :disabled="!auditBtnBooleanZhuan" v-model="evaluateData.Note" placeholder="请输入"  style="width: 100%"></el-input>
+                  <el-form-item label="基本条件评价结果" prop="Result2">
+                    <el-input  :disabled="!auditBtnBooleanZhuan" v-model="evaluateData.Result2" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
@@ -445,24 +445,27 @@
       initPage(item){
         this.evaluateData = item
 
-        this.evaluateData.SupplierId   = parseInt(item.SupplierId)
-        this.evaluateData.SumScore     = item.Score
-        this.evaluateData.SumScore1    = item.Score1
-        this.evaluateData.SumScore2    = item.Score2
-        this.evaluateData.SumScore3    = item.Score3
-        this.evaluateData.SumScore4    = item.Score4
-        this.evaluateData.SumScore5    = item.Score5
-        this.evaluateData.SumScore6    = item.Score6
-        this.evaluateData.SumScore7    = item.Score7
-        this.evaluateData.SumScore8    = item.Score8
-        this.evaluateData.Conclusion   = Number(item.Evaluate)
+        this.$set(this.evaluateData,'SupplierId', Number(item.SupplierId))
+        this.$set(this.evaluateData,'SumScore', Number(item.Score))
+        this.$set(this.evaluateData,'SumScore1', Number(item.Score1))
+        this.$set(this.evaluateData,'SumScore2', Number(item.Score2))
+        this.$set(this.evaluateData,'SumScore3', Number(item.Score3))
+        this.$set(this.evaluateData,'SumScore4', Number(item.Score4))
+        this.$set(this.evaluateData,'SumScore5', Number(item.Score5))
+        this.$set(this.evaluateData,'SumScore6', Number(item.Score6))
+        this.$set(this.evaluateData,'SumScore7', Number(item.Score7))
+        this.$set(this.evaluateData,'SumScore8', Number(item.Score8))
+        this.$set(this.evaluateData,'Conclusion', Number(item.Evaluate))
+        this.$set(this.evaluateData,'Result1', '')
+        this.$set(this.evaluateData,'Result2', '')
         // this.getList()
+
       },
       // 获取编辑信息
       showIdDatas() {
         if(this.formData.Id) {
           api.getEntity(0,this.formData.Id, this.$axios).then(res => {
-            console.log('用id去查详情信息',res)
+            console.log('用id去查详情信息111111111111',res)
             this.entrydetail.business      = ''
             var item = res.data
             this.formData                  = res.data;

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

@@ -82,6 +82,16 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
+                <el-col :span="8" >
+                  <el-form-item label="业绩评价结果" prop="Result1">
+                    <el-input  :disabled="!auditBtnBoolean" v-model="evaluateData.Result1" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8" >
+                  <el-form-item label="基本条件评价结果" prop="Result2">
+                    <el-input  :disabled="!auditBtnBoolean" v-model="evaluateData.Result2" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
                 <el-col :span="24">
                   <el-form-item label="备注">
                     <el-input type="textarea" :disabled="!auditBtnBoolean" v-model="evaluateData.Note" placeholder="请输入"  style="width: 100%"></el-input>
@@ -160,6 +170,16 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
+                <el-col :span="8" >
+                  <el-form-item label="业绩评价结果" prop="Result1">
+                    <el-input  :disabled="!auditBtnBooleanZhuan" v-model="evaluateData.Result1" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8" >
+                  <el-form-item label="基本条件评价结果" prop="Result2">
+                    <el-input  :disabled="!auditBtnBooleanZhuan" v-model="evaluateData.Result2" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
                 <el-col :span="24">
                   <el-form-item label="备注">
                     <el-input type="textarea" :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Note" placeholder="请输入"  style="width: 100%"></el-input>
@@ -410,18 +430,17 @@
       },
       initPage(item){
         this.evaluateData = item
-
-        this.evaluateData.SupplierId   = parseInt(item.SupplierId)
-        this.evaluateData.SumScore     = item.Score
-        this.evaluateData.SumScore1    = item.Score1
-        this.evaluateData.SumScore2    = item.Score2
-        this.evaluateData.SumScore3    = item.Score3
-        this.evaluateData.SumScore4    = item.Score4
-        this.evaluateData.SumScore5    = item.Score5
-        this.evaluateData.SumScore6    = item.Score6
-        this.evaluateData.SumScore7    = item.Score7
-        this.evaluateData.SumScore8    = item.Score8
-        this.evaluateData.Conclusion   = Number(item.Evaluate)
+        
+        this.$set(this.evaluateData,'SupplierId', Number(item.SupplierId))
+        this.$set(this.evaluateData,'SumScore', Number(item.Score))
+        this.$set(this.evaluateData,'SumScore1', Number(item.Score1))
+        this.$set(this.evaluateData,'SumScore2', Number(item.Score2))
+        this.$set(this.evaluateData,'SumScore3', Number(item.Score3))
+        this.$set(this.evaluateData,'SumScore4', Number(item.Score4))
+        this.$set(this.evaluateData,'SumScore5', Number(item.Score5))
+        this.$set(this.evaluateData,'Conclusion', Number(item.Evaluate))
+        this.$set(this.evaluateData,'Result1', '')
+        this.$set(this.evaluateData,'Result2', '')
         // this.getList()
       },
       // 获取编辑信息

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

@@ -77,6 +77,16 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
+                <el-col :span="8" >
+                  <el-form-item label="业绩评价结果" prop="Result1">
+                    <el-input  :disabled="!auditBtnBoolean" v-model="evaluateData.Result1" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8" >
+                  <el-form-item label="基本条件评价结果" prop="Result2">
+                    <el-input  :disabled="!auditBtnBoolean" v-model="evaluateData.Result2" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
                 <el-col :span="24">
                   <el-form-item label="备注">
                     <el-input type="textarea" :disabled="!auditBtnBoolean" v-model="evaluateData.Note" placeholder="请输入"  style="width: 100%"></el-input>
@@ -155,6 +165,16 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
+                <el-col :span="8" >
+                  <el-form-item label="业绩评价结果" prop="Result1">
+                    <el-input  :disabled="!auditBtnBooleanZhuan" v-model="evaluateData.Result1" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8" >
+                  <el-form-item label="基本条件评价结果" prop="Result2">
+                    <el-input  :disabled="!auditBtnBooleanZhuan" v-model="evaluateData.Result2" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
                 <el-col :span="24">
                   <el-form-item label="备注">
                     <el-input type="textarea" :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Note" placeholder="请输入"  style="width: 100%"></el-input>
@@ -404,18 +424,16 @@
       },
       initPage(item){
         this.evaluateData = item
-
-        this.evaluateData.SupplierId   = parseInt(item.SupplierId)
-        this.evaluateData.SumScore     = item.Score
-        this.evaluateData.SumScore1    = item.Score1
-        this.evaluateData.SumScore2    = item.Score2
-        this.evaluateData.SumScore3    = item.Score3
-        this.evaluateData.SumScore4    = item.Score4
-        this.evaluateData.SumScore5    = item.Score5
-        this.evaluateData.SumScore6    = item.Score6
-        this.evaluateData.SumScore7    = item.Score7
-        this.evaluateData.SumScore8    = item.Score8
-        this.evaluateData.Conclusion   = Number(item.Evaluate)
+        
+        this.$set(this.evaluateData,'SupplierId', Number(item.SupplierId))
+        this.$set(this.evaluateData,'SumScore', Number(item.Score))
+        this.$set(this.evaluateData,'SumScore1', Number(item.Score1))
+        this.$set(this.evaluateData,'SumScore2', Number(item.Score2))
+        this.$set(this.evaluateData,'SumScore3', Number(item.Score3))
+        this.$set(this.evaluateData,'SumScore4', Number(item.Score4))
+        this.$set(this.evaluateData,'Conclusion', Number(item.Evaluate))
+        this.$set(this.evaluateData,'Result1', '')
+        this.$set(this.evaluateData,'Result2', '')
         // this.getList()
       },
       // 获取编辑信息