Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb

yangys

2025-08-22 c1343ffa4bb95941a70ceb8bc64e72d8a982b873

 src/views/basesetting/machine.vue

@@ -43,7 +43,9 @@
          <template #menu="scope">
            <el-button type="primary" text size="default" icon="el-icon-upload" @click.stop="handleEdit(scope.row, scope.index)">编辑</el-button>
            <el-button type="primary" text size="default" icon="el-icon-upload" @click.stop="handleDel(scope.row, scope.index)">删除</el-button>
            <!--
            <el-button type="primary" text size="default" icon="el-icon-upload" @click.stop="handleUp(scope.row, scope.index)">产生机床回传机构树</el-button>
            -->
          </template>

          <template #status="{ row }">
@@ -149,6 +151,7 @@
          {
            label: '机床组',
            prop: 'machineGroupName',
            filterable:true,
            search: true,
            type: 'select',
            dicUrl: '/blade-system/dict-biz/dictionary?code=machine_group',
@@ -232,6 +235,7 @@
          {
            label: '所属机床组',
            prop: 'machineGroupCode',
            filterable:true,
            type: 'select',
            span: 12,
            dicUrl: '/blade-system/dict-biz/dictionary?code=machine_group',
@@ -296,11 +300,27 @@
            }]
          },
          {
            label: '程序临时目录',
            prop: 'progTempDir',
            type: 'input',
            span: 12,
            dataType: 'string',
          },
          {
            label: '程序下发目录',
            prop: 'progSendDir',
            type: 'input',
            span: 12,
            dataType: 'string',
          },
          {
            label: '下发目录保存时间',
            prop: 'sendDirExpiryHours',
            placeholder:"(小时)",
            max:24,
            min:1,
            type: 'number',
            span: 12,
          },
          {
            label: '程序回传目录',
@@ -309,13 +329,16 @@
            span: 12,
            dataType: 'string',
          },
        {
            label: '程序临时目录',
            prop: 'progTempDir',
            type: 'input',
          {
            label: '回传目录保存时间',
            prop: 'receiveDirExpiryHours',
             max:24,
            min:1,
            placeholder:"(小时)",
            type: 'number',
            span: 12,
            dataType: 'string',
          },
		      
          {
            label: '备注',
            prop: 'remark',