Merge branch 'master' of http://192.168.1.8:3000/baishaojie/crm_pc

src/views/basicData/productList/index.vue

@@ -5,7 +5,7 @@
         <el-card style="height: 100%; min-height: 100vh;">
           <a href="#/basicData/productClass">
             <span style="font-size: 23px;">产品分类</span>
-            <img style="margin-left: 40px;" src="../../../assets/images/bj1.png">
+            <img style="margin-left: 40px;width: 12%; height: 12%;"  src="../../../assets/images/bj1.png">
           </a>
        
         <div style="marginTop:20px;margin-left: 10px;">

src/views/productManagement/processConfiguration/index.vue

@@ -303,6 +303,7 @@
                 style="width: 254px;height: 40px;"
                 v-model="processRecordsParammapsParm.sort"
                 :disabled="false"
+                clearable
               />
             </el-form-item>
         </el-row>
@@ -313,6 +314,7 @@
                 style="width: 254px;height: 40px;"
                 v-model="processRecordsParammapsParm.process"
                 :disabled="false"
+                clearable
               />
             </el-form-item>
         </el-row>
@@ -323,6 +325,7 @@
                 style="width: 254px;height: 40px;"
                 v-model="processRecordsParammapsParm.remark"
                 :disabled="false"
+                clearable
               />
             </el-form-item>
         </el-row>
@@ -472,7 +475,7 @@ export default {
           if (response.msg !== 'fail') {
             this.dialogProcessRecords = false;
             this.dialogTitle = '';
-            // this.get_process_data();
+            this.get_process_records()
             this.$notify({
               title: '成功',
               message: '新增成功',

src/views/productManagement/productionWorkOrder/index.vue

@@ -67,6 +67,7 @@
 
       <div class="search-button-container">
         <el-button
+         v-if="isProductionWorkOrderAdd"
           class="search-button"
           type="primary"
           icon="el-icon-edit"
@@ -74,9 +75,9 @@
         >新增生产计划</el-button>
 
         <el-button
+         v-if="isProductionWorkOrderExcel"
           class="search-button"
           type="primary"
-          style="background-color: #00ff15;"
           icon="el-icon-upload2"
           @click="derive_data_excel"
         >导出</el-button>
@@ -140,19 +141,20 @@
           <el-table-column label="操作" min-width="250px" header-align="center" align="center" fixed="right">
             <template slot-scope="scope">
               <el-button class="add-button" type="primary" size="mini" @click="handleGet(scope.row)">查看</el-button>
-              <el-button class="add-button" v-if="scope.row.orderStatus === '未生产'" :style="{ backgroundColor: '#28d251' }" size="mini" @click="handleOrderTaking(scope.row)">反馈</el-button>
-              <el-button class="add-button" v-if="scope.row.orderStatus === '未生产'" :style="{ backgroundColor: '#ff3737' }" size="mini" @click="handleTurnDown(scope.row)">关单</el-button>
 
-              <el-button class="add-button" v-if="scope.row.orderStatus === '已关单'" :style="{ backgroundColor: '#5adc79' }" size="mini" @click="handleEdit(scope.row)">编辑</el-button>
-              <el-button class="add-button" v-if="scope.row.orderStatus === '已关单'" :style="{ backgroundColor: '#ff3737' }" size="mini" @click="handleWorkOrderDel(scope.row)">删除</el-button>
+              <el-button class="add-button" v-if="scope.row.orderStatus === '未生产'&&isProductionWorkOrderFeedback" :style="{ backgroundColor: '#28d251' }" size="mini" @click="handleOrderTaking(scope.row)">反馈</el-button>
+              <el-button class="add-button" v-if="scope.row.orderStatus === '未生产'&&isProductionWorkOrderClose" :style="{ backgroundColor: '#ff3737' }" size="mini" @click="handleTurnDown(scope.row)">关单</el-button>
 
-              <el-button class="add-button" v-if="scope.row.orderStatus === '待生产'" :style="{ backgroundColor: '#eeb47f' }" size="mini" @click="startProduction(scope.row)">开始生产</el-button>
+              <el-button class="add-button" v-if="scope.row.orderStatus === '已关单'&&isProductionWorkOrderEdit" :style="{ backgroundColor: '#5adc79' }" size="mini" @click="handleEdit(scope.row)">编辑</el-button>
+              <el-button class="add-button" v-if="scope.row.orderStatus === '已关单'&&isProductionWorkOrderDel" :style="{ backgroundColor: '#ff3737' }" size="mini" @click="handleWorkOrderDel(scope.row)">删除</el-button>
 
-              <el-button class="add-button" v-if="scope.row.orderStatus === '生产中'" :style="{ backgroundColor: '#eeb47f' }" size="mini" @click="handleFillInDaily(scope.row)">每日填写</el-button>
-              <el-button class="add-button" v-if="scope.row.orderStatus === '生产中'" :style="{ backgroundColor: '#28d251' }" size="mini" @click="completeProduction(scope.row)">完成</el-button>
+              <el-button class="add-button" v-if="scope.row.orderStatus === '待生产'&&isProductionWorkOrderStart" :style="{ backgroundColor: '#eeb47f' }" size="mini" @click="startProduction(scope.row)">开始生产</el-button>
+
+              <el-button class="add-button" v-if="scope.row.orderStatus === '生产中'&&isProductionWorkOrderFillout" :style="{ backgroundColor: '#eeb47f' }" size="mini" @click="handleFillInDaily(scope.row)">每日填写</el-button>
+              <el-button class="add-button" v-if="scope.row.orderStatus === '生产中'&&isProductionWorkOrderComplete" :style="{ backgroundColor: '#28d251' }" size="mini" @click="completeProduction(scope.row)">完成</el-button>
 
               <!-- <el-button class="add-button" v-if="scope.row.orderStatus === '已撤销'" :style="{ backgroundColor: '#28d251' }" size="mini" @click="handleOrderTaking(scope.row)">编辑</el-button> -->
-              <el-button class="add-button" v-if="scope.row.orderStatus === '生产完成'" :style="{ backgroundColor: '#ff3737' }" size="mini" @click="handleWorkOrderDel(scope.row)">删除</el-button>
+              <el-button class="add-button" v-if="scope.row.orderStatus === '生产完成'&&isProductionWorkOrderDel" :style="{ backgroundColor: '#ff3737' }" size="mini" @click="handleWorkOrderDel(scope.row)">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -1389,7 +1391,7 @@ import {
   GetDataByName,
   postJson,
   GetDataByNames,
-  partslistSGv2,
+  checkButtons,
   PostDataByName,
   ExecDataByConfig,
   GetAccount,transData
@@ -1497,6 +1499,17 @@ export default {
       completeProductionParm: { name: 'completeProduction', parammaps: { id: '' } },
       contractList: [],
       excelList :[],
+      isProductionWorkOrderAdd :false,
+      isProductionWorkOrderFillout :false,
+      isProductionWorkOrderComplete :false,
+      isProductionWorkOrderFeedback :false,
+      isProductionWorkOrderEdit :false,
+      isProductionWorkOrderDel :false,
+      isProductionWorkOrderClose :false,
+      isProductionWorkOrderStart :false,
+      isProductionWorkOrderExcel :false,
+      // productManagement:productionWorkOrder:excel
+
       statuesList: [
         { id: '0', name: '未生产' },
         { id: '1', name: '已关单' },
@@ -1508,6 +1521,76 @@ export default {
   },
   methods: {
  
+    get_auto_buttons() {
+ 
+    
+      const ProductionWorkOrderExcel = "productManagement:productionWorkOrder:excel";
+      const isProductionWorkOrderExcel = checkButtons(
+        this.$store.state.user.buttons,
+        ProductionWorkOrderExcel
+      );
+      this.isProductionWorkOrderExcel = isProductionWorkOrderExcel;
+
+
+      const productionWorkOrderAdd = "productManagement:productionWorkOrder:add";
+      const isProductionWorkOrderAdd = checkButtons(
+        this.$store.state.user.buttons,
+        productionWorkOrderAdd
+      );
+      this.isProductionWorkOrderAdd = isProductionWorkOrderAdd;
+
+
+      const ProductionWorkOrderFillout = "productManagement:productionWorkOrder:fillout";
+      const isProductionWorkOrderFillout = checkButtons(
+        this.$store.state.user.buttons,
+        ProductionWorkOrderFillout
+      );
+      this.isProductionWorkOrderFillout = isProductionWorkOrderFillout;
+
+const ProductionWorkOrderComplete = "productManagement:productionWorkOrder:complete";
+      const isProductionWorkOrderComplete = checkButtons(
+        this.$store.state.user.buttons,
+        ProductionWorkOrderComplete
+      );
+      this.isProductionWorkOrderComplete = isProductionWorkOrderComplete;
+
+const ProductionWorkOrderFeedback = "productManagement:productionWorkOrder:feedback";
+      const isProductionWorkOrderFeedback = checkButtons(
+        this.$store.state.user.buttons,
+        ProductionWorkOrderFeedback
+      );
+      this.isProductionWorkOrderFeedback = isProductionWorkOrderFeedback;
+
+
+const ProductionWorkOrderEdit = "productManagement:productionWorkOrder:edit";
+      const isProductionWorkOrderEdit = checkButtons(
+        this.$store.state.user.buttons,
+        ProductionWorkOrderEdit
+      );
+      this.isProductionWorkOrderEdit = isProductionWorkOrderEdit;
+
+const ProductionWorkOrderDel = "productManagement:productionWorkOrder:del";
+      const isProductionWorkOrderDel = checkButtons(
+        this.$store.state.user.buttons,
+        ProductionWorkOrderDel
+      );
+      this.isProductionWorkOrderDel = isProductionWorkOrderDel;
+
+const ProductionWorkOrderClose = "productManagement:productionWorkOrder:close";
+      const isProductionWorkOrderClose = checkButtons(
+        this.$store.state.user.buttons,
+        ProductionWorkOrderClose
+      );
+      this.isProductionWorkOrderClose = isProductionWorkOrderClose;
+
+const ProductionWorkOrderStart = "productManagement:productionWorkOrder:start";
+      const isProductionWorkOrderStart = checkButtons(
+        this.$store.state.user.buttons,
+        ProductionWorkOrderStart
+      );
+      this.isProductionWorkOrderStart = isProductionWorkOrderStart;
+    },
+
   formatJson(filterVal, jsonData) {
     return jsonData.map(v =>
       filterVal.map(j => {
@@ -2470,6 +2553,7 @@ console.log()
       this.pid = ''
       this.processRecordsList = []
       this.isEdit = false
+      this.processRecordsListAdd = []
       this.resetForm();
     },
     get_emp_data() {
@@ -2577,6 +2661,7 @@ console.log()
     this.get_contract_pull();
     this.get_emp_data();
     this.get_production_work_order();
+    this.get_auto_buttons();
   },
 };
 </script>