Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/contractManagement/acquisitionContract.vue

@@ -85,7 +85,7 @@
               style="color: #8890b1" />
           </el-select>
           <el-select v-else v-model="scope.row.status" placeholder="" class="statusselect"
-            :disabled="scope.row.status=='已完成'||scope.row.status=='已结算'"
+            :disabled="scope.row.status=='已完成'||scope.row.status=='已结算'||scope.row.status=='已驳回'"
             @change='selectstatuschange($event,scope.row)'
 
             :value="scope.row.status">
@@ -187,7 +187,7 @@
               position: relative;
               top: -1px;
               margin: 0 6px;
-            " v-if="scope.row.status != '执行中'&&scope.row.status != '已完成'" src="../../../public/img/shanchu.png"
+            " v-if="scope.row.status == '待执行'&&!scope.row.approveStatus||scope.row.status == '已驳回'" src="../../../public/img/shanchu.png"
             v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.delete`
             " @click="handleDelete(scope.row)" alt="" />
@@ -200,14 +200,14 @@
 
     <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
       @on-cancel="handleClose">
-      <!-- <div v-if="applstatus"> -->
+      <div v-if="applstatus">
       <ws-upload ref="upload" :size-limit="size" @onChange="onChange" :comp-id="compId" :appendix-ids="appendixIdss"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar" 
         v-hasPermission="`contractManagement.buyContract.buyContractInfo.appl`"
         />
-      <!-- </div>
+      </div>
       <ws-upload v-else ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" /> -->
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
     </WinseaContentModal>
   </div>
 </template>
@@ -362,7 +362,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

@@ -85,7 +85,7 @@
               style="color: #8890b1" />
           </el-select>
           <el-select v-else v-model="scope.row.status" placeholder="" class="statusselect"
-          :disabled="scope.row.status=='已完成'||scope.row.status=='已结算'"
+          :disabled="scope.row.status=='已完成'||scope.row.status=='已结算'||scope.row.status=='已驳回'"
             @change='selectstatuschange($event,scope.row)'
 
             :value="scope.row.status">
@@ -187,7 +187,7 @@
               position: relative;
               top: -1px;
               margin: 0 6px;
-            " v-if="scope.row.status != '执行中'&&scope.row.status != '已完成'" src="../../../public/img/shanchu.png"
+            " v-if="scope.row.status == '待执行'&&!scope.row.approveStatus||scope.row.status == '已驳回'" src="../../../public/img/shanchu.png"
             v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.delete`
             " @click="handleDelete(scope.row)" alt="" />
@@ -200,14 +200,14 @@
 
     <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
       @on-cancel="handleClose">
-        <!-- <div v-if="applstatus"> -->
+        <div v-if="applstatus">
       <ws-upload ref="upload" :size-limit="size" @onChange="onChange" :comp-id="compId" :appendix-ids="appendixIdss"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar" 
         v-hasPermission="`contractManagement.buyContract.buyContractInfo.appl`"
         />
-      <!-- </div>
+      </div>
       <ws-upload v-else ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" /> -->
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
     </WinseaContentModal>
   </div>
 </template>
@@ -224,6 +224,7 @@
   import {
     downloadFile
   } from '@/utils/batchDown'
+  import { hasPermission } from '../../utils/getHasPermission'
   import Pagination from '@/components/Pagination'
   import WsUpload from '@/components/WsUpload'
   import {
@@ -361,8 +362,9 @@
       }
     },
     activated() {
-      console.log(this.global)
-      // this.applstatus=this.global.hasPermission('contractManagement.buyContract.buyContractInfo.appl')
+      
+      this.applstatus=hasPermission('contractManagement.buyContract.buyContractInfo.appl')
+      console.log(this.applstatus)
       //cg.viewBudget
       //cg.viewSpareMoney
       // this.getVesselData();

src/views/contractManagement/salesContract.vue

@@ -88,7 +88,7 @@
           </el-select>
           <el-select v-else v-model="scope.row.status" placeholder="" class="statusselect"
             @change='selectstatuschange($event,scope.row)'
-            :disabled="scope.row.status=='已完成'||scope.row.status=='已结算'"
+            :disabled="scope.row.status=='已完成'||scope.row.status=='已结算'||scope.row.status=='已驳回'"
             :value="scope.row.status">
               <el-option label="执行中" value="执行中"
               style="color: #8890b1" />
@@ -190,7 +190,7 @@
               position: relative;
               top: -1px;
               margin: 0 6px;
-            " v-if="scope.row.status != '执行中'&&scope.row.status != '已完成'" src="../../../public/img/shanchu.png"
+            " v-if="scope.row.status == '待执行'&&!scope.row.approveStatus||scope.row.status == '已驳回'" src="../../../public/img/shanchu.png"
             v-hasPermission="
               `contractManagement.salesContract.salesContractInfo.delete`
             " @click="handleDelete(scope.row)" alt="" />
@@ -202,14 +202,14 @@
     </el-pagination>
     <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
       @on-cancel="handleClose">
-        <!-- <div v-if="applstatus"> -->
+        <div v-if="applstatus">
       <ws-upload ref="upload" :size-limit="size" @onChange="onChange" :comp-id="compId" :appendix-ids="appendixIdss"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar" 
         v-hasPermission="`contractManagement.buyContract.buyContractInfo.appl`"
         />
-      <!-- </div>
+      </div>
       <ws-upload v-else ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" /> -->
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
     </WinseaContentModal>
     <el-dialog
     title="合同完成"
@@ -246,6 +246,7 @@
   import {
     downloadFile
   } from '@/utils/batchDown'
+  import { hasPermission } from '../../utils/getHasPermission'
   import Pagination from '@/components/Pagination'
   import WsUpload from '@/components/WsUpload'
   import {
@@ -396,7 +397,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/inspectionManagementNew.vue

@@ -2724,7 +2724,9 @@ export default {
                 }
                 // console.log(delete this.deptBudgetList.status)
               if (this.statusTypetext == '初检') {
-                
+                if(this.zjJurisdiction){
+                  this.deptBudgetList.outType=this.outType
+                }
                 
                 if(this.deptBudgetList.id){
                   this.deptBudgetList.id=kid

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -186,7 +186,7 @@
 						</el-select>
 					</el-form-item>
 					<!-- 货名 -->
-					<el-form-item v-if='dataList1.inOutType!="退库"&&dataList1.taskTypeKey == 2' label="货名" class="huom">
+					<el-form-item v-if='dataList1.inOutType!="退库"&&dataList1.taskTypeKey == 2||dataList1.taskTypeKey == 3' label="货名" class="huom">
 						<el-select disabled v-model="dataList1.goodsName" placeholder="货名" class="huom" @change="selectgoodsName1"
 						filterable clearable>
 						<el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -219,7 +219,7 @@
             </el-select>
           </el-form-item>
           <!-- 货名 -->
-          <el-form-item v-if='dataList1.inOutType!="退库"&&dataList1.taskTypeKey == 2' label="货名" class="huom">
+          <el-form-item v-if='dataList1.inOutType!="退库"&&dataList1.taskTypeKey == 2||dataList1.taskTypeKey == 3' label="货名" class="huom">
 						<el-select disabled v-model="dataList1.goodsName" placeholder="货名" class="huom" @change="selectgoodsName1"
 						filterable clearable>
 						<el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -401,7 +401,7 @@
             />
           </el-form-item>
           <!-- 货名 -->
-          <el-form-item v-if='dataList1.inOutType!="退库"&&dataList1.taskTypeKey == 2' label="货名" class="huom">
+          <el-form-item v-if='dataList1.inOutType!="退库"&&dataList1.taskTypeKey == 2||dataList1.taskTypeKey == 3' label="货名" class="huom">
 						<el-select disabled v-model="dataList1.goodsName" placeholder="货名" class="huom" @change="selectgoodsName1"
 						filterable clearable>
 						<el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"