Merge remote-tracking branch 'origin/qingban' into qingban

public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "4.5"
+  "version": "4.4"
 }

src/views/quality/rework/index.vue

@@ -35,10 +35,10 @@
           :size="size"
           >编辑</el-button
         >
-        <el-button @click="operation(row)" link size="small" type="primary"
-          >返工工序</el-button
-        >
-        <el-button
+
+<!--        <el-button
+
+
           link
           @click="handle(row, index, 2)"
           type="primary"
@@ -51,10 +51,17 @@
           @click="handle(row, index, 1)"
           type="primary"
           v-if="row.state === 0"
+
+            size="small"
+          >确认返工</el-button>-->
+<!--        <el-button
+
+
           size="small"
           >确认返工</el-button
         >
-        <!--        <el-button
+           <el-button
+
             link
           v-if="row.state === 1"
           @click="handle(row, index, 3)"
@@ -80,6 +87,14 @@
           >领料单</el-button
         >
 
+
+<!--        <el-button
+            link
+            icon="el-icon-copy-document"
+            v-if="row.state=='1'&&(row.flowState == '0' || row.flowState == '2' || row.flowState == '-1')"
+            @click="openCheckView(row)"
+        >提审</el-button >-->
+
         <!--        <el-button-->
         <!--            link-->
         <!--            icon="el-icon-copy-document"-->
@@ -87,8 +102,18 @@
         <!--            @click="openCheckView(row)"-->
         <!--        >提审</el-button >-->
 
-        <!--        <el-button link v-if="row.flowState !== '0'" icon="el-icon-copy-document" @click="showFlowSteps(row)"-->
-        <!--        >流程</el-button>-->
+
+                <el-button link v-if="row.flowState !== '0'" icon="el-icon-copy-document" @click="showFlowSteps(row)"
+                >流程</el-button>
+
+
+<!--        <el-button
+            link
+            icon="el-icon-copy-document"
+            v-if="row.flowState == '3'"
+            @click="onCancelFlow(row)"
+        >撤销</el-button
+        >-->
 
         <!--        <el-button-->
         <!--            link-->
@@ -97,6 +122,7 @@
         <!--            @click="onCancelFlow(row)"-->
         <!--        >撤销</el-button-->
         <!--        >-->
+
       </template>
 
       <template #menu-right="{}">

src/views/system/role/index.vue

@@ -347,10 +347,10 @@ onMounted?.(() => {
 
         <el-form-item label="数据权限" prop="scope">
           <el-select v-model="formData.scope">
-            <el-option :key="0" label="全部数据" :value="0" />
-            <el-option :key="1" label="部门及子部门数据" :value="1" />
-            <el-option :key="2" label="本部门数据" :value="2" />
-            <el-option :key="3" label="本人数据" :value="3" />
+            <el-option :key="1" label="全部数据" :value="1" />
+            <el-option :key="4" label="部门及子部门数据" :value="4" />
+            <el-option :key="3" label="本部门数据" :value="3" />
+            <el-option :key="5" label="本人数据" :value="5" />
           </el-select>
         </el-form-item>