opt: 更改创建者显示，页面优化

acs2/nladmin-ui/src/views/acs/device/index.vue

@@ -50,7 +50,7 @@
         >
           {{ $t('auto.common.import') }}
         </el-button>
-        <el-button
+        <!-- <el-button
           slot="right"
           class="filter-item"
           size="mini"
@@ -59,13 +59,13 @@
           @click="reload"
         >
           {{ $t('auto.common.synchronous') }}
-        </el-button>
+        </el-button> -->
       </crudOperation>
       <!--表单组件-->
       <el-dialog
         :close-on-click-modal="false"
         :before-close="crud.cancelCU"
-        :visible.sync="crud.status.cu > 0"
+        :visible.sync="crud.status.cu"
         :title="crud.status.title"
         width="1050px"
       >

acs2/nladmin-ui/src/views/acs/history/udwData/index.vue

@@ -10,7 +10,7 @@
           label-position="right"
           label-suffix=":"
         >
-          <el-form-item  :label="$t('TaskRecord.table.Value')">
+          <el-form-item :label="$t('TaskRecord.table.Value')">
             <el-select
               v-model="form.unified_key"
               :placeholder="$t('TaskRecord.table.Value')"
@@ -23,7 +23,7 @@
               <el-option v-for="(item,index) in unified_key" :key="index" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
-          <el-form-item  :label="$t('TaskRecord.table.Numbering')">
+          <el-form-item :label="$t('TaskRecord.table.Numbering')">
             <el-input
               v-model="query.code"
               size="small"
@@ -34,6 +34,7 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+          <rrOperation />
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -112,6 +113,7 @@ import pagination from '@crud/Pagination'
 import crudUdwData from '@/api/acs/history/udwData'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
+import rrOperation from '@crud/RR.operation'
 import { getDicts } from '@/api/system/dict'
 
 const defaultForm = {
@@ -123,7 +125,7 @@ const defaultForm = {
 export default {
   dicts: [],
   name: 'UdwData',
-  components: { pagination, crudOperation },
+  components: { pagination, crudOperation, rrOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({

acs2/nladmin-ui/src/views/acs/instruction/index.vue

@@ -60,17 +60,6 @@
               <el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
-          <el-form-item :label="$t('task.txt_box.start_or_end')">
-            <el-input
-              v-model="query.point_code"
-              size="small"
-              clearable
-              :placeholder="$t('Inst.table.input_startCode_or_nextCode')"
-              style="width: 200px;"
-              class="filter-item"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
           <el-form-item :label="$t('Inst.table.instruction_type')">
             <el-select
               v-model="query.instruction_type"
@@ -85,13 +74,25 @@
               <el-option v-for="item in dict.task_type" :key="item.id" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
+          <el-form-item :label="$t('task.txt_box.start_or_end')">
+            <el-input
+              v-model="query.point_code"
+              size="small"
+              clearable
+              :placeholder="$t('Inst.table.input_startCode_or_nextCode')"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <rrOperation />
         </el-form>
-        <rrOperation />
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
         <el-button
           slot="right"
+          v-permission="['admin','task:synchronous']"
           class="filter-item"
           size="mini"
           type="primary"
@@ -105,7 +106,7 @@
       <el-dialog
         :close-on-click-modal="false"
         :before-close="crud.cancelCU"
-        :visible.sync="crud.status.cu > 0"
+        :visible.sync="crud.status.cu"
         :title="crud.status.title"
         width="500px"
       >
@@ -148,8 +149,8 @@
         <el-table-column prop="put_point_code" :label="$t('Inst.table.put_point_code')" :min-width="flexWidth('put_point_code',crud.data,$t('Inst.table.put_point_code'))" />
         <el-table-column prop="execute_device_code" :label="$t('Inst.table.execute_device_code')" :min-width="flexWidth('execute_device_code',crud.data,$t('Inst.table.execute_device_code'))" />
         <!--        <el-table-column prop="link_num" label="关联编号" />-->
-        <el-table-column prop="task_code" :label="$t('Inst.table.task_code')" :min-width="flexWidth('task_code',crud.data,$t('Inst.table.task_code'))"/>
-        <el-table-column prop="vehicle_code" :label="$t('Inst.table.vehicle_code')" :min-width="flexWidth('vehicle_code',crud.data,$t('Inst.table.vehicle_code'))"/>
+        <el-table-column prop="task_code" :label="$t('Inst.table.task_code')" :min-width="flexWidth('task_code',crud.data,$t('Inst.table.task_code'))" />
+        <el-table-column prop="vehicle_code" :label="$t('Inst.table.vehicle_code')" :min-width="flexWidth('vehicle_code',crud.data,$t('Inst.table.vehicle_code'))" />
         <el-table-column prop="instruction_status" :label="$t('Inst.table.instruction_status')" :min-width="flexWidth('instruction_status',crud.data,$t('Inst.table.instruction_status'))">
           <template slot-scope="scope">
             <span v-if="scope.row.instruction_status=='0' ">{{ $t('Inst.table.ready') }}</span>
@@ -235,6 +236,7 @@
 import crudInstruction from '@/api/acs/instruction/instruction'
 import CRUD, { presenter, header, form, crud } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
+import rrOperation from '@crud/RR.operation'
 import { getDicts } from '@/views/system/dict/dict'
 import pagination from '@crud/Pagination'
 
@@ -277,7 +279,7 @@ const defaultForm = {
 export default {
   dicts: ['task_status', 'task_type'],
   name: 'Instruction',
-  components: { crudOperation, pagination },
+  components: { crudOperation, pagination, rrOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({

acs2/nladmin-ui/src/views/acs/regional/index.vue

@@ -4,7 +4,7 @@
     <div class="head-container">
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
-        <el-button
+        <!-- <el-button
           slot="right"
           class="filter-item"
           size="mini"
@@ -13,7 +13,7 @@
           @click="reload"
         >
           {{ $t('auto.common.synchronous') }}
-        </el-button>
+        </el-button> -->
       </crudOperation>
       <!--表单组件-->
       <el-dialog

acs2/nladmin-ui/src/views/acs/route/routeLine/index.vue

@@ -51,7 +51,7 @@
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
-        <el-button
+        <!-- <el-button
           slot="right"
           class="filter-item"
           size="mini"
@@ -60,7 +60,7 @@
           @click="reload"
         >
           {{ $t('auto.common.synchronous') }}
-        </el-button>
+        </el-button> -->
       </crudOperation>
       <!--表单组件-->
       <el-dialog

acs2/nladmin-ui/src/views/acs/task/index.vue

@@ -10,6 +10,20 @@
           label-position="right"
           label-suffix=":"
         >
+          <el-form-item :label="$t('task.txt_box.Task_status')">
+            <el-select
+              v-model="query.status"
+              clearable
+              filterable
+              size="small"
+              :placeholder="$t('task.txt_box.Task_status')"
+              class="filter-item"
+              style="width: 200px"
+              @change="crud.toQuery"
+            >
+              <el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
           <el-form-item :label="$t('task.txt_box.Task_code')">
             <el-input
               v-model="query.task_code"
@@ -46,31 +60,6 @@
               <el-option v-for="item in materialList" :key="item.id" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
-          <el-form-item :label="$t('task.txt_box.Task_status')">
-            <el-select
-              v-model="query.status"
-              clearable
-              filterable
-              size="small"
-              :placeholder="$t('task.txt_box.Task_status')"
-              class="filter-item"
-              style="width: 200px"
-              @change="crud.toQuery"
-            >
-              <el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value" />
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="$t('task.txt_box.start_or_end')">
-            <el-input
-              v-model="query.point_code"
-              size="small"
-              clearable
-              :placeholder="$t('task.txt_box.Origin_or_destination')"
-              style="width: 200px;"
-              class="filter-item"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
           <el-form-item :label="$t('task.txt_box.Task_type')">
             <el-select
               v-model="query.task_type"
@@ -84,7 +73,19 @@
             >
               <el-option v-for="item in dict.task_type" :key="item.id" :label="item.label" :value="item.value" />
             </el-select>
+            <el-form-item :label="$t('task.txt_box.start_or_end')">
+              <el-input
+                v-model="query.point_code"
+                size="small"
+                clearable
+                :placeholder="$t('task.txt_box.Origin_or_destination')"
+                style="width: 200px;"
+                class="filter-item"
+                @keyup.enter.native="crud.toQuery"
+              />
+            </el-form-item>
           </el-form-item>
+          <rrOperation />
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -102,6 +103,7 @@
         </el-button>
         <el-button
           slot="right"
+          v-permission="['admin','task:synchronous']"
           class="filter-item"
           size="mini"
           type="primary"
@@ -573,6 +575,7 @@
 import crudTask from '@/api/acs/task/task'
 import CRUD, { crud, header, presenter } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
+import rrOperation from '@crud/RR.operation'
 import pagination from '@crud/Pagination'
 import deviceCrud from '@/api/acs/device/device'
 import routeCurd from '@/api/acs/route/routePlan'
@@ -581,7 +584,7 @@ import i18n from '@/i18n'
 
 export default {
   name: 'Task',
-  components: { pagination, crudOperation },
+  components: { pagination, crudOperation, rrOperation },
   dicts: ['task_status', 'task_type', 'agv_system_type', 'storage_task_type', 'kezhuan'],
   mixins: [presenter(), header(), crud()],
   cruds() {
@@ -591,7 +594,7 @@ export default {
         edit: true,
         del: true,
         reset: false,
-        download: true
+        download: false
       },
       crudMethod: { ...crudTask }})
   },