修改合同

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

@@ -131,6 +131,146 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+
+          <!-- 新加的 -->
+          <el-col :span="8">
+            <el-form-item label="合同名称" prop="ContractName">
+              <el-input v-model="formData.ContractName" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="合同子类" prop="ContractSonClass">
+              <el-input v-model="formData.ContractSonClass" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="相应小类" prop="SmallClass">
+              <el-input v-model="formData.SmallClass" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="签订日期" prop="SignedDate">
+              <el-date-picker
+                v-model="formData.SignedDate"
+                type="date"
+                placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="相对人" prop="People">
+              <el-input v-model="formData.People" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="报审序号" prop="Number">
+              <el-input v-model="formData.Number" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="选商方式" prop="ChooseWay">
+              <el-input v-model="formData.ChooseWay" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="合同标的" prop="ContractMark">
+              <el-input v-model="formData.ContractMark" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="币种" prop="Currency">
+              <el-input v-model="formData.Currency" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预算金额" prop="BudgetAmount">
+              <el-input v-model="formData.BudgetAmount" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="履行金额" prop="PerformAmount">
+              <el-input v-model="formData.PerformAmount" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否内部合同" prop="IsInternal">
+              <el-input v-model="formData.IsInternal" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否涉外合同" prop="IsForeign">
+              <el-input v-model="formData.IsForeign" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否关联交易" prop="IsDeal">
+              <el-input v-model="formData.IsDeal" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="资金流向" prop="MoneyFlows">
+              <el-input v-model="formData.MoneyFlows" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="资金渠道" prop="MoneyChannel">
+              <el-input v-model="formData.MoneyChannel" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="资金渠道子类" prop="MoneyChannelSon">
+              <el-input v-model="formData.MoneyChannelSon" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="资金渠道小类" prop="MoneyChannelSmall">
+              <el-input v-model="formData.MoneyChannelSmall" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="签约单位" prop="SingUnit">
+              <el-input v-model="formData.SingUnit" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="履行地点" prop="Place">
+              <el-input v-model="formData.Place" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="纠纷解决方式" prop="DisputeResolution">
+              <el-input v-model="formData.DisputeResolution" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="资金渠道小类" prop="MoneyChannelSmall">
+              <el-input v-model="formData.MoneyChannelSmall" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="提交日期" prop="SubmitDate">
+              <el-date-picker
+                v-model="formData.SubmitDate"
+                type="date"
+                placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="用章名称" prop="SealName">
+              <el-input v-model="formData.SealName" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="PO编码" prop="PoNumber">
+              <el-input v-model="formData.PoNumber" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+
+
+
+
         </el-row>
         <el-row>
           <el-col :span="8">
@@ -324,22 +464,22 @@
           ContractNo:[
             { required: true, message: '请输入合同编号', trigger: 'blur' },
           ],
-          ProjectPlace:[
-            { required: true, message: '请输入工程地点', trigger: 'blur' },
-          ],
-          ProjectOwner:[
-            { required: true, message: '请输入项目负责人', trigger: 'blur' },
-          ],
-          Telephone:[
-            { required: true, message: '请输入联系人电话', trigger: 'blur' },
-            { pattern: /^1[3456789]\d{9}$/, message: '手机号码格式不对' }
-          ],
-          ProjectType:[
-            { required: true, message: '请选择项目类别', trigger: 'change' },
-          ],
-          ContractMode:[
-            { required: true, message: '请输入合同模式', trigger: 'blur' },
-          ],
+          // ProjectPlace:[
+          //   { required: true, message: '请输入工程地点', trigger: 'blur' },
+          // ],
+          // ProjectOwner:[
+          //   { required: true, message: '请输入项目负责人', trigger: 'blur' },
+          // ],
+          // Telephone:[
+          //   { required: true, message: '请输入联系人电话', trigger: 'blur' },
+          //   { pattern: /^1[3456789]\d{9}$/, message: '手机号码格式不对' }
+          // ],
+          // ProjectType:[
+          //   { required: true, message: '请选择项目类别', trigger: 'change' },
+          // ],
+          // ContractMode:[
+          //   { required: true, message: '请输入合同模式', trigger: 'blur' },
+          // ],
           SubPackage:[
             { required: true, message: '请选择是否分包', trigger: 'change' },
           ],
@@ -353,15 +493,86 @@
             { validator: PlanFinishDateVar, trigger: 'change' }
           ],
           Amount:[
-            { required: true, message: '请输入', trigger: 'blur' },
+            {  message: '请输入', trigger: 'blur' },
             {pattern: /^\+?((0|([1-9]+\d*))|((0\.\d+)|([1-9]+\d*\.\d+)))$/,  message: '输入格式不正确', trigger: 'blur'},
           ],
           ContractPeriod:[
-            { required: true, message: '请输入', trigger: 'blur' },
+            {  message: '请输入', trigger: 'blur' },
             {pattern: /^\+?((0|([1-9]+\d*))|((0\.\d+)|([1-9]+\d*\.\d+)))$/,  message: '输入格式不正确', trigger: 'blur'},
             { validator: ContractPeriod, trigger: 'blur' }
           ],
-
+          ContractSonClass:[
+            { required: true, message: '请输入', trigger: 'blur' },
+          ],
+          SmallClass:[
+            { required: true, message: '请输入', trigger: 'blur' },
+          ],
+          SignedDate:[
+            { required: true, message: '请输入', trigger: 'blur' },
+          ],
+          People:[
+            { required: true, message: '请输入', trigger: 'blur' },
+          ],
+          Number:[
+            { required: true, message: '请输入', trigger: 'blur' },
+          ],
+          ChooseWay:[
+            { required: true, message: '请输入', trigger: 'blur' },
+          ],
+          Currency:[
+            { required: true, message: '请输入', trigger: 'blur' },
+          ],
+          BudgetAmount:[
+            { required: true, message: '请输入', trigger: 'blur' },
+          ],
+          PerformAmount:[
+            { required: true, message: '请输入', trigger: 'blur' },
+          ],
+          IsInternal:[
+            { required: true, message: '请输入', trigger: 'blur' },
+          ],
+          IsForeign:[
+            { required: true, message: '请输入', trigger: 'blur' },
+          ],
+          IsDeal:[
+            { required: true, message: '请输入', trigger: 'blur' },
+          ],
+          MoneyFlows:[
+            { required: true, message: '请输入', trigger: 'blur' },
+          ],
+          MoneyChannel:[
+            { required: true, message: '请输入', trigger: 'blur' },
+          ],
+          MoneyChannelSon:[
+            { required: true, message: '请输入', trigger: 'blur' },
+          ],
+          MoneyChannelSmall:[
+            { required: true, message: '请输入', trigger: 'blur' },
+          ],
+          SingUnit:[
+            { required: true, message: '请输入', trigger: 'blur' },
+          ],
+          Place:[
+            { required: true, message: '请输入', trigger: 'blur' },
+          ],
+          DisputeResolution:[
+            { required: true, message: '请输入', trigger: 'blur' },
+          ],
+          SubmitDate:[
+            { required: true, message: '请输入', trigger: 'blur' },
+          ],
+          SealName:[
+            { required: true, message: '请输入', trigger: 'blur' },
+          ],
+          PoNumber:[
+            { required: true, message: '请输入', trigger: 'blur' },
+          ],
+          ContractMark:[
+            { required: true, message: '请输入', trigger: 'blur' },
+          ],
+          ContractName:[
+            { required: true, message: '请输入', trigger: 'blur' },
+          ],
         },
 
         ContractClassDisabled:true,
@@ -404,8 +615,30 @@
           // ModifiedBy: '',
           //缺少
           SubPackage: 0,
-          ContractClass: ''
-
+          ContractClass: '',
+          ContractSonClass:'',
+          SmallClass:'',
+          SignedDate:'',
+          People:'',
+          Number:'',
+          ChooseWay:'',
+          ContractMark:'',
+          Currency:'',
+          BudgetAmount:'',
+          PerformAmount:'',
+          IsInternal:'',
+          IsForeign:'',
+          IsDeal:'',
+          MoneyFlows:'',
+          MoneyChannel:'',
+          MoneyChannelSon:'',
+          MoneyChannelSmall:'',
+          SingUnit:'',
+          Place:'',
+          DisputeResolution:'',
+          SubmitDate:'',
+          SealName:'',
+          PoNumber:'',
         },
         SupplierSelectList:[],//企业名称列表
         dictionary:'',//数据字典
@@ -683,7 +916,7 @@
         //   }).catch(err => {
         //     console.error(err)
         //   })
-        
+
         // /* generate workbook object from table */
         // let wb = XLSX.utils.table_to_book(
         //   document.querySelector('#rebateSetTable')

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

@@ -251,12 +251,89 @@
     </el-dialog>
 
 
+    <el-dialog
+      title="合同信息"
+      :visible.sync="dialogVisibleContract"
+      :close-on-click-modal="false"
+      width="70%">
+
+      <el-form :model="tableDataList" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+        <el-table
+            :data="tableDataList.tableData"
+            stripe
+            :border="true"
+            height="500"
+            size="small"
+            style="width: 100%">
+           <el-table-column type="index"  min-width="70" label="序号" align="center" show-overflow-tooltip></el-table-column>
+           <el-table-column  prop="SourceSupplierName"  min-width="110" label="企业名称" align="center" show-overflow-tooltip></el-table-column>
+           <el-table-column  prop="SupplierName"  min-width="110" label="选择企业名称" align="center" show-overflow-tooltip >
+             <template slot-scope="scope">
+               <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-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-form-item>
+             </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 >
+             <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%" >
+                    <el-option label="供应商" value="01" key="01"></el-option>
+                    <el-option label="承包商" value="02" key="02"></el-option>
+                    <el-option label="服务商" value="03" key="03"></el-option>
+                  </el-select>
+                </el-form-item>
+             </template>
+           </el-table-column>
+           <el-table-column  prop="ContractNo"  min-width="110" label="合同编号" align="center" show-overflow-tooltip></el-table-column>
+           <el-table-column  prop="ContractName"  min-width="110" label="合同名称" align="center" show-overflow-tooltip></el-table-column>
+           <el-table-column  prop="ContractSonClass"  min-width="110" label="合同子类" align="center" show-overflow-tooltip></el-table-column>
+           <el-table-column  prop="SmallClass"  min-width="110" label="相应小类" align="center" show-overflow-tooltip></el-table-column>
+           <el-table-column  prop="SignedDate"  min-width="110" label="签订日期" align="center" show-overflow-tooltip></el-table-column>
+           <el-table-column  prop="People"  min-width="110" label="相对人" align="center" show-overflow-tooltip></el-table-column>
+           <el-table-column  prop="Number"  min-width="110" label="报审序号" align="center" show-overflow-tooltip></el-table-column>
+           <el-table-column  prop="ChooseWay"  min-width="110" label="选商方式" align="center" show-overflow-tooltip></el-table-column>
+           <el-table-column  prop="Amount"  min-width="110" label="合同总金额(万元)" align="center" show-overflow-tooltip></el-table-column>
+           <el-table-column  prop="BudgetAmount"  min-width="110" label="预算金额" align="center" show-overflow-tooltip></el-table-column>
+           <el-table-column  prop="ContractMark"  min-width="110" label="合同标的" align="center" show-overflow-tooltip></el-table-column>
+           <el-table-column  prop="Currency"  min-width="110" label="币种" align="center" show-overflow-tooltip></el-table-column>
+           <el-table-column  prop="DisputeResolution"  min-width="110" label="纠纷解决方式" align="center" show-overflow-tooltip></el-table-column>
+           <el-table-column  prop="EndDate"  min-width="110" label="截止时间（履行期限）" align="center" show-overflow-tooltip></el-table-column>
+           <el-table-column  prop="IsDeal"  min-width="110" label="是否关联交易" align="center" show-overflow-tooltip></el-table-column>
+           <el-table-column  prop="IsForeign"  min-width="110" label="是否涉外合同" align="center" show-overflow-tooltip></el-table-column>
+           <el-table-column  prop="IsInternal"  min-width="110" label="是否内部合同" align="center" show-overflow-tooltip></el-table-column>
+           <el-table-column  prop="MoneyChannel"  min-width="110" label="资金渠道" align="center" show-overflow-tooltip></el-table-column>
+           <el-table-column  prop="MoneyChannelSmall"  min-width="110" label="资金渠道小类" align="center" show-overflow-tooltip></el-table-column>
+           <el-table-column  prop="MoneyChannelSon"  min-width="110" label="资金渠道子类" align="center" show-overflow-tooltip></el-table-column>
+           <el-table-column  prop="MoneyFlows"  min-width="110" label="资金流向" align="center" show-overflow-tooltip></el-table-column>
+           <el-table-column  prop="PerformAmount"  min-width="110" label="履行金额" align="center" show-overflow-tooltip></el-table-column>
+           <el-table-column  prop="Place"  min-width="110" label="履行地点" align="center" show-overflow-tooltip></el-table-column>
+           <el-table-column  prop="PoNumber"  min-width="110" label="PO编码" align="center" show-overflow-tooltip></el-table-column>
+           <el-table-column  prop="ProjectOwner"  min-width="110" label="项目负责人" align="center" show-overflow-tooltip></el-table-column>
+           <el-table-column  prop="Remark"  min-width="110" label="备注" align="center" show-overflow-tooltip></el-table-column>
+           <el-table-column  prop="SealName"  min-width="110" label="用章名称" align="center" show-overflow-tooltip></el-table-column>
+           <el-table-column  prop="SingUnit"  min-width="110" label="签约单位" align="center" show-overflow-tooltip></el-table-column>
+           <el-table-column  prop="StartDate"  min-width="110" label="开始时间" align="center" show-overflow-tooltip></el-table-column>
+           <el-table-column  prop="SubmitDate"  min-width="110" label="提交日期" align="center" show-overflow-tooltip></el-table-column>
+
+          </el-table>
+        </el-form>
+
+      <div style="display: flex;justify-content: flex-end;margin-top: 16px;">
+        <el-button type="primary" :loading="uploadTrueClickLoading" size="small" @click="uploadTrueClick">确 认</el-button>
+      </div>
+    </el-dialog>
+
+
     <el-dialog title="上传文件"  width="600px" :visible.sync="uploadshow">
       <el-form label-width="100px">
         <el-row>
           <el-col :span="24">
             <el-upload multiple style="margin-top: 10px;" action="" ref="refuploadattach"
-                       :http-request="uploadrequest" :before-upload="beforeAvatarUpload">
+                       :http-request="uploadrequest" :before-remove="beforeRemove">
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
           </el-col>
@@ -266,6 +343,7 @@
         </el-row>
       </el-form>
     </el-dialog>
+
   </div>
 </template>
 <script>
@@ -274,6 +352,7 @@
   import permissionApi from '@/api/oilcontract/permission';
   import axios from 'axios'
   import uploadajax from '@/assets/js/uploadajax.js'
+  import oilsupplierApi from '@/api/oilsupplier/annualaudit'
   export default {
     computed: {
       ...mapGetters({
@@ -316,14 +395,43 @@
           }else{
             return item
           }
-
         }
-      }
+      },
+      SupplierNameDataFun:function(){
+        return function(name,k){
+          // var list = []
+          var list = this.SupplierNameData.filter(function(x, index) {
+            return x.SupplierName.indexOf(name)!=-1;
+          });
+          if(list.length == 1){
+            this.tableDataList.tableData[k].SupplierName = list[0].SupplierName
+            this.tableDataList.tableData[k].SupplierId = list[0].Id
+          }
+          if(list.length == 0){
+            return this.SupplierNameData
+          }else{
+            return list
+          }
+        }
+      },
+
     },
     name: 'oilcontract',
-
     data() {
       return {
+        uploadTrueClickLoading:false,
+        rules:{
+         name: [
+             { required: true, message: '请输入名称', trigger: 'change' },
+           ],
+         ContractClass: [
+             { required: true, message: '请输入名称', trigger: 'change' },
+           ],
+        },
+        ContractSelectName:'',
+        options: [],
+        SupplierNameData:[],
+        dialogVisibleContract:false,
         uploadshow: false,
         Excelurl: '',
         importDialogVisible: false,
@@ -352,6 +460,10 @@
         CreateOn: [],
         //查询项
         searchFormReset: {},
+        tableDataList:{
+          tableData:[],
+        },
+
         searchForm: {
           Id: '',
           SupplierId: '',
@@ -387,7 +499,68 @@
           ModifiedOn: '',
           ModifiedUserId: '',
           ModifiedBy: '',
-
+        },
+        formData: {
+          Id: '',
+          SupplierId: '',
+          SupplierName: '',
+          ProjectName: '',
+          ContractNo: '',
+          ProjectPlace: '',
+          ProjectOwner: '',
+          Telephone: '',
+          ProjectType: '',
+          ContractMode: '',
+          Amount: '',
+          ContractPeriod: '',
+          OpenDate: '',
+          PlanFinishDate: '',
+          ConstructionUnit: '',
+          ConstructionOwner: '',
+          ConstructionTelphone: '',
+          BuildUnit: '',
+          BuildOwner: '',
+          BuildTelphone: '',
+          SuperviseUnit: '',
+          SuperviseOwner: '',
+          SuperviseTelphone: '',
+          QualityUnit: '',
+          QualityOwner: '',
+          QualityTelphone: '',
+          Remark: '',
+          // IsDelete: '',
+          // CreateOn: '',
+          // CreateUserId: '',
+          // CreateBy: '',
+          // ModifiedOn: '',
+          // ModifiedUserId: '',
+          // ModifiedBy: '',
+          //缺少
+          SubPackage: 0,
+          ContractClass: '',
+          ContractSonClass:'',
+          SmallClass:'',
+          SignedDate:'',
+          People:'',
+          Number:'',
+          ChooseWay:'',
+          ContractMark:'',
+          Currency:'',
+          BudgetAmount:'',
+          PerformAmount:'',
+          IsInternal:'',
+          IsForeign:'',
+          IsDeal:'',
+          MoneyFlows:'',
+          MoneyChannel:'',
+          MoneyChannelSon:'',
+          MoneyChannelSmall:'',
+          SingUnit:'',
+          Place:'',
+          DisputeResolution:'',
+          SubmitDate:'',
+          SealName:'',
+          PoNumber:'',
         },
         tableColumns: [
           // {
@@ -593,8 +766,97 @@
       //this.getDictOptions()
       // 状态判断
       this.statusFun()
+
+      this.contractSelete()
+
     },
     methods: {
+      onSelectContractClass(e){
+        var that = this;
+        setTimeout(function() {
+          that.$set(that.tableDataList.tableData[e],'SupplierName', that.$refs.supplierIdSelect.selectedLabel)
+          // that.tableDataList.tableData[e].SupplierName = that.$refs.supplierIdSelect.selectedLabel
+        }, 200);
+        console.log(that.tableDataList.tableData)
+      },
+      contractSelete(){
+        oilsupplierApi.getSupListCode(this.$axios).then(res => {
+          console.log('企业名称数据',res)
+          this.SupplierNameData = res.data.items
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      uploadTrueClick(){
+        this.$refs['ruleForm'].validate((valid) => {
+          if (valid) {
+            this.uploadTrueClickLoading = true
+            var data = {
+              Items:this.tableDataList.tableData
+            }
+            console.log('传之前的数据',data)
+            data.Items[0].ContractClass = '02'
+            data.Items[0].SupplierId = 2
+            data.Items[0].SupplierName = '北京三川世纪能源科技股份公司'
+            var list = {
+              Items:[
+                {
+                  ContractClass : '02',
+                  SupplierId : 2,
+                  SupplierName : '北京三川世纪能源科技股份公司'
+                }
+              ]
+            }
+            api.saveImportExcel(list, this.$axios).then(res => {
+              this.uploadTrueClickLoading = false
+              console.log('保存合同',res.data)
+            }).catch(err => {
+              this.uploadTrueClickLoading = false
+            })
+          } else {
+            this.$message({type: 'warning', message: '请填写完整才能导入哦'})
+          }
+        });
+
+        // this.dialogVisibleContract = false
+      },
+      // 导入
+      uploadExcel () {
+        this.tableDataList.tableData = []
+        this.importloading = true
+        this.uploadshow = false
+
+        let params = {
+          ExcelUrl: this.Excelurl
+        }
+        api.importExcel(params, this.$axios).then(res => {
+          this.importloading = false
+          if (res.data.code === 0) {
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+            // this.initDatas()
+            this.dialogVisibleContract = true
+            for(var key in res.data.item){
+              console.log(key,res.data.item[key])
+              res.data.item[key].SupplierId = res.data.item[key].SupplierId==''?'':res.data.item[key].SupplierId
+
+              this.tableDataList.tableData.push(res.data.item[key])
+            }
+            console.log(22222222222222,this.tableDataList.tableData)
+          } else if (res.data.code === -1) {
+            this.errorDialogVisible = true
+            this.textarea = res.data.message
+          } else if (res.data.code === -2) {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+        })
+
+      },
       //状态判断
       statusFun(){
         var data = {
@@ -778,6 +1040,9 @@
       importExcel () {
         this.uploadshow = true
       },
+      beforeRemove(){
+        return true
+      },
       uploadrequest (option) {
         let _this = this
         if (process.client) {
@@ -808,33 +1073,6 @@
         }
       },
 
-
-      // 导入
-      uploadExcel () {
-        this.importloading = true
-        this.uploadshow = false
-        let params = {
-          ExcelUrl: this.Excelurl
-        }
-        api.importExcel(params, this.$axios).then(res => {
-          this.importloading = false
-          if (res.data.code === 0) {
-            this.$message({
-              type: 'success',
-              message: res.data.message
-            })
-            this.initDatas()
-          } else if (res.data.code === -1) {
-            this.errorDialogVisible = true
-            this.textarea = res.data.message
-          } else if (res.data.code === -2) {
-            this.$message({
-              type: 'warning',
-              message: res.data.message
-            })
-          }
-        })
-      }
     }
   }
 
@@ -845,4 +1083,17 @@
     margin: 1rem 0 2rem;
     text-align: right;
   }
+  .fromClass /deep/ .el-input{
+    width: 100% !important;
+  }
+  .select_form /deep/ .el-select-dropdown{
+    height: 120px;
+    overflow: hidden;
+  }
+  .select_form /deep/ .el-scrollbar{
+    height: 120px;
+  }
+  .demo-ruleForm /deep/ .el-form-item__content{
+    margin-left: 0px !important;
+  }
 </style>