ysy 1 rok temu
rodzic
commit
4feba114e2

BIN
dist.rar


+ 1 - 116
src/views/material/BOMmanage/components/workingProcedure.vue

@@ -158,122 +158,7 @@
           </ele-pro-table>
         </el-tab-pane>
         <el-tab-pane label="质检参数" name="质检参数">
-          <ele-pro-table
-            ref="qualityTable"
-            :datasource="datasource"
-            :immediate="true"
-            :need-page="false"
-            :columns="columns"
-          >
-            <!-- 表头工具栏 -->
-            <template v-if="!isView" v-slot:toolbar>
-              <el-button
-                size="small"
-                icon="el-icon-plus"
-                class="ele-btn-icon"
-                type="primary"
-                @click.native="openParam('质检')"
-                >添加参数</el-button
-              >
-            </template>
-
-            <template v-slot:sort="{ row }">
-              <div v-if="isView">{{ row.sort }}</div>
-              <el-input v-else v-model="row.sort"></el-input>
-            </template>
-
-            <!-- 默认值 -->
-            <template v-slot:defaultValue="{ row }">
-              <div v-if="isView">
-                {{ row.defaultValue }}
-              </div>
-              <div v-else>
-                <el-input
-                  v-if="
-                    row.textType == 1 ||
-                    row.textType == 4 ||
-                    row.textType == 3 ||
-                    row.textType == 5
-                  "
-                  v-model="row.defaultValue"
-                  placeholder="请输入"
-                ></el-input>
-                <el-select
-                  v-if="row.textType == 2"
-                  v-model="row.defaultValue"
-                  placeholder="请选择"
-                >
-                  <el-option label="TRUE" :value="'TRUE'" />
-                  <el-option label="FALSE" :value="'FALSE'" />
-                </el-select>
-              </div>
-            </template>
-
-            <!-- 上限 -->
-            <template v-slot:maxValue="{ row }">
-              <div v-if="isView">
-                {{ row.maxValue }}
-              </div>
-              <div v-else>
-                <el-input
-                  v-if="row.textType == 3"
-                  v-model="row.maxValue"
-                  placeholder="请输入"
-                ></el-input>
-              </div>
-            </template>
-            <!-- 下限 -->
-            <template v-slot:minValue="{ row }">
-              <div v-if="isView">
-                {{ row.minValue }}
-              </div>
-              <div v-else>
-                <el-input
-                  v-if="row.textType == 3"
-                  v-model="row.minValue"
-                  placeholder="请输入"
-                ></el-input>
-              </div>
-            </template>
-
-            <!-- 单位 -->
-            <template v-slot:unitName="{ row }">
-              <div v-if="isView">
-                {{ row.unitName }}
-              </div>
-              <div v-else>
-                <DictSelection
-                  v-if="row.textType != 2 && row.textType != 5"
-                  dictName="工艺参数单位"
-                  clearable
-                  filterable
-                  v-model="row.unitName"
-                >
-                </DictSelection>
-
-                <span v-if="row.textType == 5"> h(小时)</span>
-              </div>
-            </template>
-
-            <!-- 操作列 -->
-            <template v-slot:action="{ row }">
-              <el-popconfirm
-                class="ele-action"
-                title="确定要删除当前参数吗?"
-                @confirm="remove(row, '工艺')"
-              >
-                <template v-slot:reference>
-                  <el-link
-                    type="danger"
-                    :underline="false"
-                    icon="el-icon-delete"
-                  >
-                    删除
-                  </el-link>
-                </template>
-              </el-popconfirm>
-            </template>
-          </ele-pro-table>
+   
         </el-tab-pane>
         <el-tab-pane label="生产节拍" name="生产节拍">
           <el-form label-width="100px" ref="form" :model="beatParam">

+ 3 - 1
src/views/system/organization/components/org-user-edit.vue

@@ -21,7 +21,7 @@
           </el-form-item>
 
           <el-form-item label="所属工厂:">
-            <el-select style="width: 100%" clearable v-model="form.factoryId"   filterable placeholder="请选择所属工厂">
+            <el-select style="width: 100%" clearable v-model="form.factoryId" multiple  filterable placeholder="请选择所属工厂">
               <el-option
                 v-for="item in factoryList"
                 :label="item.name"
@@ -329,6 +329,8 @@ export default {
           getUserDetail(this.data.id).then((res) => {
             this.form = {...res};
 
+            
+
             // this.deptTree = []
             // this.form.deptIds = []
             // if (this.form.deptTree) {