前端

src/views/contractManagement/collectionContractRecord.vue

@@ -1045,6 +1045,7 @@
 
       //上传付款截图
       handleAvatarSuccess(e) {
+        console.log(this)
         this.imageUrl.push(e.url)
       },
       printBig() {
@@ -1466,7 +1467,7 @@
   }
 
   .upLoad {
-    width: 40%;
+    width: 76%;
     margin: 0 auto;
     // border: 1px solid #8890b1;
     // border-radius: 3px;
@@ -1478,9 +1479,12 @@
   // }
   .avatar-uploader {
     position: relative;
-    width: 178px;
+    // width: 178px;
   }
-
+  .el-upload {
+    display: inline-block;
+    text-align: left;
+}
   .avatar-uploader .el-upload {
     border: 1px dashed #d9d9d9;
     border-radius: 6px;
@@ -1511,6 +1515,7 @@
     border: 1px solid #8890b1;
     border-radius: 5px;
     display: inline-block;
+    margin:5px ;
   }
 
   .pay_img {

src/views/contractManagement/component/routers/route.js

@@ -391,7 +391,7 @@ const contractManagementRouter = {
         // module: 'procurement.sparepart.applDetail'
       },
       hidden: true
-    },// 代收合同
+    },// 代储合同
     {
       path: 'storageContract',
       component: () =>
@@ -400,12 +400,12 @@ const contractManagementRouter = {
       meta: {
         title: 'storageContract',
         shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.dsContract',
+        module: 'contractManagement.dcContract',
         permissicon: [],
         keepAlive: true
       }
     },
-    //代收合同添加
+    //代储合同添加
     {
       path: 'storageContractAdd',
       component: () =>
@@ -414,14 +414,14 @@ const contractManagementRouter = {
       meta: {
         title: 'storageContractAdd',
         shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.dsContract.dsContractInfo.add',
+        module: 'contractManagement.dcContract.dcContractInfo.add',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
       },
       hidden: true
     },
-    //代收合同编辑
+    //代储合同编辑
     {
       path: 'storageContractEdit',
       component: () =>
@@ -430,14 +430,14 @@ const contractManagementRouter = {
       meta: {
         title: 'storageContractEdit',
         shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.dsContract.dsContractInfo.edit',
+        module: 'contractManagement.dcContract.dcContractInfo.edit',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
       },
       hidden: true
     },
-    //代收合同查看
+    //代储合同查看
     {
       path: 'storageContractExamine',
       component: () =>
@@ -446,14 +446,14 @@ const contractManagementRouter = {
       meta: {
         title: 'storageContractExamine',
         shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.dsContract.dsContractInfo.view',
+        module: 'contractManagement.dcContract.dcContractInfo.view',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
       },
       hidden: true
     },
-    //代收合同记录
+    //代储合同记录
     {
       path: 'storageContractRecord',
       component: () =>
@@ -462,7 +462,7 @@ const contractManagementRouter = {
       meta: {
         title: 'storageContractRecord',
         shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.dsContract.dsContractInfo.list',
+        module: 'contractManagement.dcContract.dcContractInfo.list',
         permissicon: [],
         keepAlive: false
         // module: 'procurement.sparepart.applDetail'

src/views/contractManagement/storageContract.vue

@@ -3,9 +3,9 @@
     <BaseHeaderLayout :leftSpan="8">
       <template slot="left">
         <ws-button type="primary" @click="handleAdd()"
-          v-hasPermission="`contractManagement.dsContract.dsContractInfo.add`">添加</ws-button>
+          v-hasPermission="`contractManagement.dcContract.dcContractInfo.add`">添加</ws-button>
         <ws-button @click="exportlist()" v-hasPermission="
-            `contractManagement.dsContract.dsContractInfo.view`
+            `contractManagement.dcContract.dcContractInfo.view`
           ">导出</ws-button>
       </template>
       <template slot="right">
@@ -107,7 +107,7 @@
         <template slot-scope="scope">
           <img width="16" height="16" style="vertical-align: text-top; margin: 0 6px"
             src="../../../public/img/chakan.png" @click="handleExamine(scope.row)" v-hasPermission="
-              `contractManagement.dsContract.dsContractInfo.view`
+              `contractManagement.dcContract.dcContractInfo.view`
             " alt="" />
           <div v-if="
               (scope.row.approveStatus != '待决策人审核' &&
@@ -115,7 +115,7 @@
             " style="display: inline-block">
             <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px"
               src="../../../public/img/bianji.png" @click="handleEdit(scope.row)" v-hasPermission="
-                `contractManagement.dsContract.dsContractInfo.edit`
+                `contractManagement.dcContract.dcContractInfo.edit`
               " alt="" />
           </div>
           <img width="16" height="17" style="
@@ -125,7 +125,7 @@
               margin: 0 6px;
             " v-if="scope.row.status != '执行中'&&scope.row.status != '已完成'" src="../../../public/img/shanchu.png"
             v-hasPermission="
-              `contractManagement.dsContract.dsContractInfo.delete`
+              `contractManagement.dcContract.dcContractInfo.delete`
             " @click="handleDelete(scope.row)" alt="" />
           <img width="16" height="17" style="
                 vertical-align: text-top;
@@ -134,7 +134,7 @@
                 margin: 0 6px;
               " v-if="scope.row.status == '执行中'||scope.row.status == '已完成'" src="../../../public/img/daichu.png"
             v-hasPermission="
-                `contractManagement.dsContract.dsContractInfo.list`
+                `contractManagement.dcContract.dcContractInfo.list`
               " @click="handleRecord(scope.row)" alt="" />
         </template>
       </el-table-column>

src/views/contractManagement/storageContractEdit.vue

@@ -579,8 +579,17 @@
           })
           .toPromise()
           .then((response) => {
-            this.newSelectedOptions=response.sourceProvince+ '/' + response.sourceCity + '/' + response.sourceArea
-             this.newSelectedOptions1=response.deliveryProvince+ '/' + response.deliveryCity + '/' + response.deliveryArea
+            if(response.sourceProvince&&response.sourceCity&&response.sourceArea){
+              this.newSelectedOptions=response.sourceProvince+ '/' + response.sourceCity + '/' + response.sourceArea
+            }else if(response.sourceProvince&&response.sourceArea){
+              this.newSelectedOptions=response.sourceProvince+ '/' + response.sourceArea
+            }
+            if(response.deliveryProvince&&response.deliveryCity&&response.deliveryArea){
+               this.newSelectedOptions1=response.deliveryProvince+ '/' + response.deliveryCity + '/' + response.deliveryArea
+            }else if(response.deliveryProvince&&response.deliveryArea){
+
+            }
+            
             this.deptBudgetList = response
             // var arr=this.deptBudgetList.personCharge.split(',')
             // for (let i = 0; i < arr.length; i++) {
@@ -1785,4 +1794,7 @@
     color:#000;
     border:1px solid #ccc;
   }
+  .inline-input {
+    width: 100%;
+  }
 </style>