其它报工结束卷 2022年10月26日 sxm

src/views/modules/sys/role-add-or-update.vue

@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     class="sl-menu-item"
-    width="349px"
+    width="500px"
     :title="!dataForm.id ? '新增' : '修改'"
     :close-on-click-modal="false"
     :visible.sync="visible">
@@ -14,6 +14,10 @@
         <el-input style="width: 150px" v-model="dataForm.remark" placeholder="备注"></el-input>
       </el-form-item>
       <el-form-item size="mini" label="授权">
+        <el-row>
+          <el-col class="down-tree" :span="14">
+            <!--              @node-click="getMenuInfo"-->
+            <!--              @check-change="getMenuInfo"-->
             <el-tree
               :data="menuList"
               :props="menuListTreeProps"
@@ -21,7 +25,45 @@
               ref="menuListTree"
               :default-expand-all="false"
               show-checkbox>
+<!--                <span class="custom-tree-node" slot-scope="{ node, data }">-->
+<!--                  <span>{{ node.label }}</span>-->
+<!--                     <span v-if="data.type ==1">-->
+<!--                      <el-checkbox type="text" size="mini">只读</el-checkbox>-->
+<!--                      <el-checkbox type="text" size="mini">删除</el-checkbox>-->
+<!--                      <el-checkbox type="text" size="mini">修改</el-checkbox>-->
+<!--                      <el-checkbox type="text" size="mini">完全控制</el-checkbox>-->
+<!--                     </span>-->
+<!--                </span>-->
             </el-tree>
+          </el-col>
+<!--          <el-col style="margin-top: 50px;margin-left: 10px" :span="8">-->
+<!--            <el-form :inline="true" label-position="top" label-width="95px" style="padding: 5px;">-->
+<!--              <el-form-item label="功能编号" prop="menuId">-->
+<!--                <el-input style="width: 150px" v-model="menuInfo.menuId"></el-input>-->
+<!--              </el-form-item>-->
+<!--              <el-form-item label="功能名称" prop="name">-->
+<!--                <el-input style="width: 150px" v-model="menuInfo.name"></el-input>-->
+<!--              </el-form-item>-->
+
+<!--              <fieldset class="customer-field" style="width: 100%;">-->
+<!--                <legend>权限</legend>-->
+<!--                <el-form-item>-->
+<!--                  <el-checkbox v-model="menuInfo.readOnly" label="只读"></el-checkbox>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item>-->
+<!--                  <el-checkbox v-model="menuInfo.canModified" label="修改"></el-checkbox>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item>-->
+<!--                  <el-checkbox v-model="menuInfo.canDelete" label="删除"></el-checkbox>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item>-->
+<!--                  <el-checkbox v-model="menuInfo.fullControl" label="完全控制"></el-checkbox>-->
+<!--                </el-form-item>-->
+<!--              </fieldset>-->
+<!--            </el-form>-->
+<!--          </el-col>-->
+        </el-row>
+
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -32,9 +74,9 @@
 </template>
 
 <script>
-import {treeDataTranslate} from '@/utils'
+  import {treeDataTranslate} from '@/utils'
 
-export default {
+  export default {
     data() {
       return {
         visible: false,
@@ -43,6 +85,14 @@ export default {
           label: 'name',
           children: 'children'
         },
+        menuInfo: {
+          menuId: null,
+          name: '',
+          readOnly: 'N',
+          canDelete: 'N',
+          canModified: 'N',
+          fullControl: 'N'
+        },
         dataForm: {
           id: 0,
           roleName: '',
@@ -56,6 +106,7 @@ export default {
         tempKey: -666666 // 临时key, 用于解决tree半选中状态项不能传给后台接口问题. # 待优化
       }
     },
+
     methods: {
       init(id) {
         this.dataForm.id = id || 0
@@ -90,7 +141,7 @@ export default {
                 console.log(x1)
                 this.$nextTick(() => {
                   for (let x1Element of x1) {
-                  this.$refs.menuListTree.setChecked(x1Element,true,false)
+                    this.$refs.menuListTree.setChecked(x1Element, true, false)
                   }
                 })
               }
@@ -98,10 +149,24 @@ export default {
           }
         })
       },
+      // 点击获取角色权限 ,
+      getMenuInfo(node, data, value) {
+        this.menuInfo.menuId = data.data.menuId
+        this.menuInfo.name = data.data.name
+        data.readOnly = 'Y'
+      },
       // 表单提交
       dataFormSubmit() {
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            // let temp = {
+            //   readOnly: 'N',
+            //   canDelete: 'N',
+            //   canModified: 'N',
+            //   fullControl: 'N',
+            //   menuId: this.tempKey
+            // }
+            // let menusList = [].concat(this.$refs.menuListTree.getCheckedNodes(), [temp], this.$refs.menuListTree.getHalfCheckedNodes())
             this.$http({
               url: this.$http.adornUrl(`/sys/role/${!this.dataForm.id ? 'save' : 'update'}`),
               method: 'post',
@@ -110,6 +175,7 @@ export default {
                 'roleName': this.dataForm.roleName,
                 'remark': this.dataForm.remark,
                  'menuIdList': [].concat(this.$refs.menuListTree.getCheckedKeys(), [this.tempKey], this.$refs.menuListTree.getHalfCheckedKeys())
+                // 'menuIdList': menusList
               })
             }).then(({data}) => {
               if (data && data.code === 0) {
@@ -124,8 +190,17 @@ export default {
         })
       }
     }
-}
+  }
 </script>
 <style lang="scss">
 
+  .down-tree {
+
+    height: 300px;
+
+    display: block;
+
+    overflow-y: scroll;
+
+  }
 </style>

src/views/modules/yieldReport/otherReport/fqc_split_roll_report.vue

@@ -227,7 +227,7 @@
               </el-button>
             </el-form-item>
             <el-form-item style="margin-top: 0px;margin-left: 10px;">
-              <el-button class="customer-bun-mid" type="primary" @click="startProduceModal"
+              <el-button class="customer-bun-mid" type="primary" @click="showFinishScheduleModal"
                          :disabled="buttonTags.produceFlag"
                          style=" margin-bottom: 5px;width: 80px;">
                 {{buttons.finishSchedule}}
@@ -3288,7 +3288,7 @@ export default {
       this.scheduleData.seqNo = seqNo;
       this.currentRollOps.seqNo = seqNo;
       this.operatorData = operatorData;
-     this.getMultiLanguageList();//刷新多语言的信息
+     // this.getMultiLanguageList();//刷新多语言的信息
       //清空当前的页面列表参数
       this.sfdcTimeList = [];
       this.sfdcToolList = [];

src/views/modules/yieldReport/otherReport/rework_inspect_report.vue

@@ -301,7 +301,7 @@
               </el-button>
             </el-form-item>
             <el-form-item style="margin-top: -24px;margin-left: 100px;">
-              <el-button class="customer-bun-mid" type="primary" @click="startProduceModal"
+              <el-button class="customer-bun-mid" type="primary" @click="showFinishScheduleModal"
                          :disabled="buttonTags.produceFlag"
                          style=" margin-bottom: 5px;width: 80px;">
                 {{buttons.finishSchedule}}