ysy 1 an în urmă
părinte
comite
dce682fc2b

BIN
dist.rar


+ 100 - 0
src/views/material/BOMmanage/components/workingProcedure.vue

@@ -968,6 +968,106 @@
             </template>
           </ele-pro-table>
         </el-tab-pane>
+
+
+        <el-tab-pane label="" name="工艺文件">
+          <ele-pro-table
+            ref="fileTable"
+            :columns="jobColumns1"
+            :datasource="datasource"
+            :need-page="false"
+            :immediate="true"
+          >
+            <!-- 表头工具栏 -->
+            <template v-if="!isView" v-slot:toolbar>
+              <el-button type="primary" @click="addFile">添加</el-button>
+            </template>
+            <template v-slot:action="{ row, $index }">
+              <el-link type="primary" @click="handleDel(row, $index)"
+                >删除</el-link
+              >
+            </template>
+            <template v-slot:type="{ row }">
+              <div v-if="isView">{{ row.type }}</div>
+              <el-input
+                v-else
+                v-model="row.type"
+                placeholder="请输入"
+              ></el-input>
+            </template>
+
+            <template v-slot:code="{ row }">
+              <div v-if="isView">{{ row.code }}</div>
+              <el-input
+                v-else
+                v-model="row.code"
+                placeholder="请输入"
+              ></el-input>
+            </template>
+
+            <template v-slot:versions="{ row }">
+              <div v-if="isView">{{ row.versions }}</div>
+              <el-input
+                v-else
+                v-model="row.versions"
+                placeholder="请输入"
+              ></el-input>
+            </template>
+
+            <template v-slot:status="{ row }">
+              <div v-if="isView">{{
+                statusOption.filter((item) => item.value == row.status)[0].label
+              }}</div>
+              <div v-else>
+                <template>
+                  <el-select v-model="row.status" placeholder="请选择">
+                    <el-option
+                      v-for="item in statusOption"
+                      :label="item.label"
+                      :value="item.value"
+                      :key="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </template>
+              </div>
+            </template>
+
+            <template v-slot:path="{ row }">
+              <div v-if="isView">附件</div>
+              <div v-else
+                ><div class="downLoad">
+                  <fileUpload
+                    v-model="jobFiledList"
+                    :show-file-list="false"
+                    module="main"
+                    @input="uploadedJobSuccess($event, row)"
+                    :showLib="false"
+                    :limit="1"
+                  />
+                  <div v-if="row.path">
+                    <el-button
+                      style="margin-left: 10px"
+                      size="mini"
+                      type="primary"
+                      @click="downloadFile(row.path)"
+                      >下载</el-button
+                    >
+                  </div></div
+                >
+              </div>
+            </template>
+
+            <template v-slot:remark="{ row }">
+              <div v-if="isView">{{ row.remark }}</div>
+              <el-input
+                v-else
+                v-model="row.remark"
+                placeholder="请输入"
+              ></el-input>
+            </template>
+          </ele-pro-table>
+        </el-tab-pane>
       </el-tabs>
     </el-card>
     <!-- 选择工艺参数 -->

+ 9 - 1
src/views/material/product/detail.vue

@@ -16,6 +16,7 @@
 
         <el-row :gutter="24">
           <el-col :span="8">
+
             <el-form-item label="分类" prop="categoryLevelName">
               <el-input
                 v-model="form.categoryLevelName"
@@ -30,6 +31,8 @@
             </el-form-item>
           </el-col>
 
+
+      
           <el-col :span="8" v-else key="2">
             <el-form-item label="编码" prop="code">
               <el-input v-model="form.code"   :disabled="status == 0" />
@@ -349,6 +352,8 @@
         this.categoryLevelPathId = info.category.categoryLevelPathIdParent;
         this.judgeSet(info);
         this.searchDeptNodeClick(this.form.chargeDeptId);
+
+        this.$forceUpdate()
       },
       // 判断字段类型并赋值
       judgeSet(info) {
@@ -400,7 +405,10 @@
       handleDirectorChange(id, info) {},
       // 确定分类
       async confirmCategory(node, title, PathInfo, ruleCode) {
+   
+      if(this.status != 0) {
         this.$set(this.form, 'code', null);
+      }
         this.categoryLevelPathId = PathInfo.categoryLevelPathId.split(',')[0];
 
         if (title == '选择产品分类') {
@@ -415,7 +423,7 @@
 
           this.ruleCode = ruleCode;
 
-          if (ruleCode && ruleCode != '自定义') {
+          if (ruleCode && ruleCode != '自定义'  && this.status != 0) {
             const code = await getCode(ruleCode);
             this.$set(this.form, 'code', code);
           }

+ 2 - 0
src/views/system/menu/index.vue

@@ -167,6 +167,8 @@ export default {
             return this.$util.toDateString(cellValue);
           }
         },
+
+
         {
           columnKey: 'action',
           label: '操作',