Explorar el Código

修改合同导入,企业名称输入联想

王宇昕 hace 5 años
padre
commit
b108271f12

+ 1 - 1
src/dashoo.cn/frontend_web/nuxt.config.js

@@ -174,7 +174,7 @@ module.exports = {
     // baseURL: '//192.168.1.44:10091/api/' // 本机开发使用
     // 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.1.41:10091/api/' // 本机开发使用
-    // baseURL: '//192.168.124.13:10091/api/' // 本机开发使用
+    // baseURL: '//192.168.124.10:10091/api/' // 本机开发使用
 
 
     /* --------Nuxt Start发版用 START-------------- */
     /* --------Nuxt Start发版用 START-------------- */
     // baseURL: '/api/'
     // baseURL: '/api/'

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

@@ -104,7 +104,7 @@
           <el-col :span="8">
           <el-col :span="8">
             <el-form-item label="合同总金额" prop="Amount">
             <el-form-item label="合同总金额" prop="Amount">
               <el-input v-model="formData.Amount" placeholder="请输入" style="width: 100%">
               <el-input v-model="formData.Amount" placeholder="请输入" style="width: 100%">
-                <template slot="append">(元)</template>
+                <template slot="append">(元)</template>
               </el-input>
               </el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
@@ -205,7 +205,7 @@
           <el-col :span="8">
           <el-col :span="8">
             <el-form-item label="预算金额" prop="BudgetAmount">
             <el-form-item label="预算金额" prop="BudgetAmount">
               <el-input v-model="formData.BudgetAmount" placeholder="请输入" style="width: 100%">
               <el-input v-model="formData.BudgetAmount" placeholder="请输入" style="width: 100%">
-                <template slot="append">(元)</template>
+                <template slot="append">(元)</template>
               </el-input>
               </el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
@@ -214,7 +214,7 @@
           <el-col :span="8">
           <el-col :span="8">
             <el-form-item label="履行金额" prop="PerformAmount">
             <el-form-item label="履行金额" prop="PerformAmount">
               <el-input v-model="formData.PerformAmount" placeholder="请输入" style="width: 100%">
               <el-input v-model="formData.PerformAmount" placeholder="请输入" style="width: 100%">
-                <template slot="append">(元)</template>
+                <template slot="append">(元)</template>
               </el-input>
               </el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>

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

@@ -255,7 +255,7 @@
       title="合同导入"
       title="合同导入"
       :visible.sync="dialogVisibleContract"
       :visible.sync="dialogVisibleContract"
       :close-on-click-modal="false"
       :close-on-click-modal="false"
-      width="70%">
+      width="80%">
 
 
       <el-form :model="tableDataList" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
       <el-form :model="tableDataList" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
         <el-table
         <el-table
@@ -270,7 +270,7 @@
            <el-table-column  prop="SupplierName"  width="250" label="确认企业名称" align="center" show-overflow-tooltip >
            <el-table-column  prop="SupplierName"  width="250" label="确认企业名称" align="center" show-overflow-tooltip >
              <template slot-scope="scope">
              <template slot-scope="scope">
                <el-form-item  style="margin-bottom: 0px;" :prop="'tableData.' + scope.$index + '.SupplierId'" :rules="rules.name">
                <el-form-item  style="margin-bottom: 0px;" :prop="'tableData.' + scope.$index + '.SupplierId'" :rules="rules.name">
-                 <el-select size="small" v-model="scope.row.SupplierId" ref="supplierIdSelect" placeholder="请选择" @change="onSelectContractClass(scope.$index)">
+                 <el-select size="small" v-model="scope.row.SupplierId" filterable :ref="'supplierIdSelect'+scope.$index" placeholder="请选择" @change="onSelectContractClass(scope.$index)">
                     <el-option v-for="(item,index) of (SupplierNameDataFun(scope.row.SourceSupplierName,scope.$index))" :key="index" :label="item.SupplierName" :value="item.Id"></el-option>
                     <el-option v-for="(item,index) of (SupplierNameDataFun(scope.row.SourceSupplierName,scope.$index))" :key="index" :label="item.SupplierName" :value="item.Id"></el-option>
                  </el-select>
                  </el-select>
                </el-form-item>
                </el-form-item>
@@ -779,7 +779,8 @@
       onSelectContractClass (e) {
       onSelectContractClass (e) {
         var that = this
         var that = this
         setTimeout(function () {
         setTimeout(function () {
-          that.$set(that.tableDataList.tableData[e], 'SupplierName', that.$refs.supplierIdSelect.selectedLabel)
+          // console.log(that.$refs['supplierIdSelect' + `${e}`] )
+          that.$set(that.tableDataList.tableData[e], 'SupplierName', that.$refs['supplierIdSelect' + `${e}`].selectedLabel)
           // that.tableDataList.tableData[e].SupplierName = that.$refs.supplierIdSelect.selectedLabel
           // that.tableDataList.tableData[e].SupplierName = that.$refs.supplierIdSelect.selectedLabel
         }, 200)
         }, 200)
         console.log(that.tableDataList.tableData)
         console.log(that.tableDataList.tableData)
@@ -844,6 +845,7 @@
             this.dialogVisibleContract = true
             this.dialogVisibleContract = true
             for(var key in res.data.item){
             for(var key in res.data.item){
               console.log(key,res.data.item[key])
               console.log(key,res.data.item[key])
+              res.data.item[key].ContractClass =  res.data.item[key].SourceContractClass=='承揽合同'?'02':res.data.item[key].ContractClass
               res.data.item[key].SupplierId = res.data.item[key].SupplierId==''?'':res.data.item[key].SupplierId
               res.data.item[key].SupplierId = res.data.item[key].SupplierId==''?'':res.data.item[key].SupplierId
 
 
               this.tableDataList.tableData.push(res.data.item[key])
               this.tableDataList.tableData.push(res.data.item[key])