前端

src/views/contractManagement/acquisitionContract.vue

@@ -358,7 +358,7 @@
       }
     },
     activated() {
-      this.applstatus=hasPermission('contractManagement.buyContract.buyContractInfo.appl')
+      // this.applstatus=hasPermission('contractManagement.buyContract.buyContractInfo.appl')
       //cg.viewBudget
       //cg.viewSpareMoney
       // this.getVesselData();

src/views/contractManagement/purchaseContract.vue

@@ -357,6 +357,7 @@
       }
     },
     activated() {
+      console.log(this.global)
       // this.applstatus=this.global.hasPermission('contractManagement.buyContract.buyContractInfo.appl')
       //cg.viewBudget
       //cg.viewSpareMoney

src/views/contractManagement/salesContract.vue

@@ -392,7 +392,7 @@
       }
     },
     activated() {
-      this.applstatus=hasPermission('contractManagement.buyContract.buyContractInfo.appl')
+      // this.applstatus=hasPermission('contractManagement.buyContract.buyContractInfo.appl')
       //cg.viewBudget
       //cg.viewSpareMoney
       // this.getVesselData();

src/views/houseSelfCollect/inspectInfo.vue

@@ -372,7 +372,7 @@
             formdata.append('file', b);
             axios({
               method: 'post',
-              url: 'global.uploadPath',
+              url: this.global.uploadPath,
               data: formdata
             }).then((response) => {
               //编辑接口
@@ -405,7 +405,7 @@
             formdata.append('file', b);
             axios({
               method: 'post',
-              url: 'global.uploadPath',
+              url: this.global.uploadPath,
               data: formdata
             }).then((response) => {
               //编辑接口

src/views/profitable/oilcost.vue

@@ -179,8 +179,7 @@
       <!-- </div> -->
     </el-dialog>
     <el-dialog width='50%' :visible.sync="dialogVisible2" :title="title1">
-      <div  style='padding:20px;' v-for="(item,index) in recordList" :style="{'border-bottom':(index!=recordList.length-1?'1px solid #ccc':'none')}"
->
+      <div  style='padding:20px;' v-for="(item,index) in recordList" :style="{'border-bottom':(index!=recordList.length-1?'1px solid #ccc':'none')}">
         <div style='width:100%;justify-content: space-between;' class='flex'>
           <div style='width:33.333%;text-align:left;'>{{item.operateUser}}</div>
           <div style='width:33.333%;text-align:center;'>{{item.dealMsg!='请款'?item.approveResult==1?'通过':'驳回':item.dealMsg}}</div>

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -85,7 +85,7 @@
                 <span v-if="scope.row.taskStatus == '待审核'" class="executory"></span>
                 <span v-if="scope.row.taskStatus == '执行中'" class="inExecution"></span>
                 <span v-if="scope.row.taskStatus == '已完成'" class="done"></span>
-                {{scope.row.approveStatus?scope.row.approveStatus:scope.row.taskStatus }}
+                {{ scope.row.taskStatus }}
               </span>
             </template>
             <img v-if="scope.row.taskStatus == '执行中'" width="17" height="18"
@@ -121,7 +121,9 @@
               <el-divider direction="vertical" v-if=" scope.row.taskStatus == '执行中' ||
                 scope.row.taskStatus == '已驳回'"></el-divider>
             </span>
-
+            <span v-hasPermission="`warehouseManagement.warehouse.warehouseInfoTask.delete`">
+              <el-divider direction="vertical" v-if="scope.row.show"></el-divider>
+            </span>
             <span class="corles" v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.delete`
               " v-if="scope.row.show" @click="rectify(scope.row)">矫正</span>

src/views/warehouse/warehouseManagementAdd.vue

@@ -318,8 +318,8 @@
       },
       // 上传附件
       uploadSuccessHandle(e) {
-        this.deptBudgetList.addressUrl += e.url + ','
-        this.addressUrls.push(e.url)
+        this.deptBudgetList.addressUrl += e.data.url + ','
+        this.addressUrls.push(e.data.url)
       },
       onChange(files) {
         this.fileNum = files

src/views/warehousenew/warehouseManagementAdd.vue

@@ -77,23 +77,8 @@
     </ws-form>
     <ws-form ref="deptBudgetList" :model="deptBudgetList">
       <div class="small-title" v-show="radio == 1">上传附件</div>
-      <!-- <el-upload ref='upload' action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false" :on-success="
-          (res, file) => {
-            uploadSuccessHandle(res)
-          }
-        " class="avatar-uploader" accept=".jpg, .jpeg, .png, .gif">
-        <el-button v-show="radio == 1">上传附件</el-button>
-      </el-upload> -->
       <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
         @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
-      <!-- <div class="addressUrls" v-if="addressUrls != null">
-        <div class="addressUrls-item">
-          <div v-for="(item, index) in addressUrls" class="addressUrl" :key="index">
-            <div @click="close(index)" class="iconfont icon-guanbi"></div>
-            <img v-if="addressUrls != null" width="100" height="100" :src="item" alt="" />
-          </div>
-        </div>
-      </div> -->
       <div style="margin-bottom: 5px" class="small-title">仓库定位</div>
       <!-- <map-drag  @marker="marker" @selectedAddress="selectedAddress" @provinceChange='provinceChange' @pickedAddress='getInfo'></map-drag> -->
       <map-drag @marker="marker" ref="childMap" :isShowaddress='false' v-on:addressListen='getAddress' v-on:pickedAddress='searchAddress' ></map-drag>