Ver Fonte

Bug Fix

liqianyi há 2 anos atrás
pai
commit
cdb78fab29

+ 4 - 1
src/views/modules/order/order.vue

@@ -141,7 +141,7 @@
           <template slot-scope="scope">
             <el-button v-if="isAuth('order:ctl:info')" type="text" size="small" @click="detailHandle(scope.row.orderId)">查看</el-button>
             <el-button v-if="isAuth('order:ctl:editor') && Number(scope.row.state) === 2" type="text" size="small" @click="addOrUpdateHandle(scope.row.orderId,false)">编辑</el-button>
-            <el-button v-if="isAuth('order:clt:revoke') && Number(scope.row.state) === 1" type="text" size="small" @click="cancelOrder(scope.row)">撤回</el-button>
+            <el-button v-if="isAuth('order:clt:revoke') && Number(scope.row.state) === 1 && scope.row.creatorId === userId.toString()" type="text" size="small" @click="cancelOrder(scope.row)">撤回</el-button>
             <el-button v-if="isAuth('order:ctl:determine') && Number(scope.row.state) === 3 && Number(scope.row.orderState) === 6" type="text" size="small" @click="techConfirm(scope.row)">技术确定</el-button>
 <!--            <el-button v-if="isAuth('order:ctl:deliver') && Number(scope.row.orderState) === 3" type="text" size="small" @click="deliverHandle(scope.row.orderId)">发货</el-button>-->
 <!--            <el-button v-if="isAuth('order:ctl:arrived') && Number(scope.row.orderState) === 4 " type="text" size="small" @click="arrivedHandle(scope.row)">送达</el-button>-->
@@ -184,6 +184,8 @@
     },
     created () {
       this.optionsState = this.$store.state.common.approveStates
+      this.userId = this.$store.state.user.id
+      console.log(this.userId)
       this.queryData()
     },
     data () {
@@ -201,6 +203,7 @@
         dataListLoading: false,
         dataListSelections: [],
         optionsState: [ ],
+        userId: 0,
         optionsOrderState: [
           {
             code: '1', value: '未开始'

+ 1 - 1
src/views/modules/sale/outsource.vue

@@ -224,7 +224,7 @@
             <el-button v-if="isAuth('pur:commDetail:info')" type="text" size="small" @click="detailHandle(scope.row.purchaseId)">查看</el-button>
             <el-button v-if="isAuth('pur:commDetail:update')  && (Number(scope.row.approvalState) === 1)" type="text" size="small" @click="addOrUpdateHandle(scope.row.purchaseId)">编辑</el-button>
             <el-button v-if="isAuth('pur:commDetail:updatePurCommissionDetail') && (Number(scope.row.approvalState) === 3) && (Number(scope.row.purchaseState) === 1)" type="text" size="small" @click="outsourceHandle(scope.row)">委外</el-button>
-            <el-button v-if="isAuth('pur:commDetail:infoPutIn') && (Number(scope.row.approvalState) === 3) && (Number(scope.row.purchaseState) === 2)" type="text" size="small" @click="inBound(scope.row)">入库</el-button>
+            <el-button v-if="isAuth('pur:commDetail:infoPutIn') && (Number(scope.row.approvalState) === 3) && (Number(scope.row.purchaseState) === 2||(Number(scope.row.purchaseState) === 5))" type="text" size="small" @click="inBound(scope.row)">入库</el-button>
             <el-button v-if="isAuth('pur:commDetail:infoPutInAgain') && (Number(scope.row.approvalState) === 3) && (Number(scope.row.purchaseState) === 5)" type="text" size="small" @click="inBound(scope.row)">再次入库</el-button>
           </template>
         </el-table-column>

+ 1 - 1
src/views/modules/sale/purchase.vue

@@ -209,7 +209,7 @@
             <el-button v-if="isAuth('purchase:detail:info')" type="text" size="small" @click="detailHandle(scope.row.procurementId)">查看</el-button>
             <el-button v-if="isAuth('purchase:detail:update') && (Number(scope.row.approvalState) === 1)" type="text" size="small" @click="addOrUpdateHandle(scope.row.procurementId)">编辑</el-button>
             <el-button v-if="isAuth('purchase:detail:updatePurchaseDetail') && (Number(scope.row.purchaseState) === 1)" type="text" size="small" @click="operateHandle(scope.row)">采购</el-button>
-            <el-button v-if="isAuth('purchase:detail:infoPutIn') && (Number(scope.row.approvalState) === 3  && Number(scope.row.purchaseState) > 1)" type="text" size="small" @click="inboundHandle(scope.row)">入库</el-button>
+            <el-button v-if="isAuth('purchase:detail:infoPutIn') && (Number(scope.row.approvalState) === 3  && (Number(scope.row.purchaseState) === 2 || Number(scope.row.purchaseState) === 5))" type="text" size="small" @click="inboundHandle(scope.row)">入库</el-button>
             <el-button v-if="isAuth('purchase:detail:infoPutInAgain') && (Number(scope.row.purchaseState) === 5)" type="text" size="small" @click="inboundHandle(scope.row.procurementId)">再次入库</el-button>
           </template>
         </el-table-column>

+ 0 - 6
src/views/modules/tech/product-add-or-update.vue

@@ -111,12 +111,6 @@
                 align="center"
                 label="产品名称">
               </el-table-column>
-              <el-table-column
-                prop="materialName"
-                header-align="center"
-                align="center"
-                label="物品名称">
-              </el-table-column>
               <el-table-column
                 prop="productSpec"
                 header-align="center"