Merge branch 'master' of http://120.46.159.163:7400/ezhizao/ezhizao_dms_vue

src/views/business/drawing/drawingDetail.vue

@@ -48,52 +48,57 @@
                             <!-- <el-table-column type="selection" width="40" align="center" /> -->
                             <el-table-column type="index" label="行号" width="50" align="center" />
 
-                            <el-table-column label="图纸" prop="drawingName" align="center">
-                                <template #default="scope">
-                                    <el-button link type="primary">{{
-                                        scope.row.drawingName }}</el-button>
-                                </template>
-                            </el-table-column>
+                            <el-table-column label="图纸" prop="drawingName" align="center" />
+                            <el-table-column label="类型" prop="pattern" align="center" width="80" />
                             <el-table-column label="状态" width="80px" prop="status" align="center">
                                 <template #default="scope">
                                     <dict-tag :options="drawing_status" :value="scope.row.status" />
                                 </template>
                             </el-table-column>
-                            <el-table-column label="是否废弃" width="80px" prop="abandoned" align="center">
+                            <!-- <el-table-column label="是否废弃" width="80px" prop="abandoned" align="center">
                                 <template #default="scope">
                                     <dict-tag :options="drawing_type" :value="scope.row.abandoned" />
                                 </template>
-                            </el-table-column>
+                            </el-table-column> -->
                             <el-table-column label="制作人" width="100px" prop="producer" align="center" />
                             <el-table-column label="审核人" width="100px" prop="reviewer" align="center" />
                             <el-table-column label="批准人" width="100px" prop="issuer" align="center" />
-                            <el-table-column fixed="right" label="操作" align="center" width="280px">
+                            <el-table-column fixed="right" label="操作" align="center">
                                 <template #default="scope">
-                                    <el-button v-if="scope.row.status == 0 && scope.row.abandoned == 0" link type="primary"
-                                        v-hasPermi="['business:electronicDrawings:examine']"
-                                        @click="handlePreview(scope.row)">审核
-                                    </el-button>
-                                    <el-button v-if="scope.row.status == 1" link type="success" plain
-                                        v-hasPermi="['business:electronicDrawings:raift']"
-                                        @click="handlePreview(scope.row)">批准</el-button>
-
-                                    <el-upload :action="webHost + '/common/upload'" :headers="headers" :limit="1"
-                                        :on-success="handleReplaceSuccess" :on-exceed="handleReplaceExceed"
-                                        :before-upload="beforeUpload" :show-file-list="false">
+                                    <el-button-group
+                                        style="display: flex;align-items: center; justify-content: center;  flex-wrap: nowrap;">
+                                        <el-button v-if="scope.row.status == 0 && scope.row.abandoned == 0" link
+                                            type="primary" v-hasPermi="['business:electronicDrawings:examine']"
+                                            @click="handlePreview(scope.row)">审核
+                                        </el-button>
+                                        <el-button v-if="scope.row.status == 1" link type="success" plain
+                                            v-hasPermi="['business:electronicDrawings:raift']"
+                                            @click="handlePreview(scope.row)">批准</el-button>
+
+                                        <!-- <el-upload style="display: flex;align-items: center; justify-content: center;"
+                                            :action="webHost + '/common/upload'" :headers="headers" :limit="1"
+                                            :on-success="handleReplaceSuccess" :on-exceed="handleReplaceExceed"
+                                            :before-upload="beforeUpload" :show-file-list="false">
+                                            <el-button v-if="scope.row.status == 2 && scope.row.abandoned == 0" link
+                                                type="warning" plain
+                                                v-hasPermi="['business:electronicDrawings:replace']">替换</el-button>
+                                        </el-upload> -->
+
+                                        <el-button v-if="scope.row.status == 2 && scope.row.abandoned == 0" link
+                                            type="warning" v-hasPermi="['business:electronicDrawings:replace']"
+                                            @click="replaceClick(scope.row)">替换
+                                        </el-button>
+
+                                        <el-button
+                                            v-if="(scope.row.status == 0 || scope.row.status == 1) && scope.row.abandoned == 0"
+                                            link type="danger" v-hasPermi="['business:electronicDrawings:NG']"
+                                            @click="handleDrawingNG(scope.row)">NG
+                                        </el-button>
                                         <el-button v-if="scope.row.status == 2 && scope.row.abandoned == 0" link
-                                            type="warning" plain
-                                            v-hasPermi="['business:electronicDrawings:replace']">替换</el-button>
-                                    </el-upload>
-
-                                    <el-button
-                                        v-if="(scope.row.status == 0 || scope.row.status == 1) && scope.row.abandoned == 0"
-                                        link type="danger" v-hasPermi="['business:electronicDrawings:NG']"
-                                        @click="handleDrawingNG(scope.row)">NG
-                                    </el-button>
-                                    <el-button v-if="scope.row.status == 2 && scope.row.abandoned == 0" link type="danger"
-                                        v-hasPermi="['business:electronicDrawings:remove']"
-                                        @click="handleDrawingRemove(scope.row)">作废
-                                    </el-button>
+                                            type="danger" v-hasPermi="['business:electronicDrawings:remove']"
+                                            @click="handleDrawingRemove(scope.row)">作废
+                                        </el-button>
+                                    </el-button-group>
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -119,7 +124,7 @@
         </div>
 
         <!-- 添加图纸对话框 -->
-        <el-dialog title="上传文件" v-model="open" width="500px" append-to-body>
+        <el-dialog title="上传文件" v-model="open" width="500px" @close="cancel" append-to-body>
             <el-form ref="drawingRef" :model="form" :rules="rules" label-width="120px" v-loading="formLoading">
 
 
@@ -139,7 +144,7 @@
                         <template #append>
                             <el-upload :disabled="!form.technologicalProcessDetailId" :action="webHost + '/common/upload'"
                                 :headers="headers" :limit="1" :on-success="handleSuccess" :on-exceed="handleExceed"
-                                :before-upload="beforeUpload" :show-file-list="false">
+                                :before-upload="beforeUpload" :show-file-list="false" ref="uploadrefss">
                                 <el-button icon="Upload"></el-button>
                             </el-upload>
                         </template>
@@ -174,7 +179,8 @@ const hostUrl = import.meta.env.VITE_HOST_URL
 const { proxy } = getCurrentInstance();
 const { drawing_status } = proxy.useDict("drawing_status");
 const { drawing_type } = proxy.useDict("drawing_type");
-
+const uploadrefss = ref()
+const parentName = ref("")
 const total = ref(0)
 const route = useRoute();
 const coverName = ref("")
@@ -188,7 +194,7 @@ const technologicalDetailId = ref(null)
 const open = ref(false)
 const draform = ref({})
 const currentDrawing = ref({})
-const replaceForm  = ref({})
+const replaceForm = ref({})
 const repeatingDrawings = ref([])
 const loading = ref(false);
 const drawingList = ref([])
@@ -206,6 +212,7 @@ const data = reactive({
     form: {
         pageNum: 1,
         pageSize: 10,
+        parentId: null,
         technologicalProcessDetailId: null,
         groupDetailList: [],
         code: "",
@@ -327,6 +334,7 @@ function getDrawing() {
 /**上传成功回调 */
 function handleSuccess(row) {
     form.value.url = row.fileName
+
     var fileDrawing = {}
     fileDrawing.drawingName = row.originalFilename
     fileDrawing.technologicalProcessDetailId = currentTechnologicalDetail.value.id
@@ -342,7 +350,7 @@ function handleSuccess(row) {
                 formLoading.value = false
             } else {
                 //判断重名文件状态是否已发行需要替换
-                if (repeatingDrawings.value[0].status == 0) {
+                if (repeatingDrawings.value[0].status == 2) {
                     proxy.$modal.msgWarning("待审核中已有相同文件");
                     var item = {}
                     item = repeatingDrawings.value[0]
@@ -381,12 +389,38 @@ function handleReplaceSuccess(row) {
     handleReplace(item)
 
 }
+
+function replaceClick(row) {
+    form.value.parentId = row.id
+    form.value.technologicalProcessDetailId = row.technologicalProcessDetailId
+    open.value = true
+}
 function submitForm() {
     proxy.$refs["drawingRef"].validate((valid) => {
         console.log(proxy.$refs["drawingRef"])
         if (valid) {
-            open.value = false
-            saveDrawingDetail()
+
+            if (form.value.parentId) {
+                proxy.$modal
+                    .confirm("是否确认替换图纸？")
+                    .then(function () {
+                        if (currentTechnologicalDetail.value.id !== undefined && currentTechnologicalDetail.value.id !== null && currentTechnologicalDetail.value.id !== 'undefined') {
+                            form.value.technologicalProcessDetailId = currentTechnologicalDetail.value.id
+                        }
+                        return replace(form.value);
+                    })
+                    .then(() => {
+                        reset()
+                        getList();
+                        open.value = false
+                        proxy.$modal.msgSuccess("替换成功");
+                    })
+                    .catch(() => { });
+            } else {
+                console.log(form.value, 79)
+                saveDrawingDetail()
+            }
+
         }
     });
 }
@@ -395,6 +429,7 @@ function saveDrawingDetail() {
     if (currentTechnologicalDetail.value.id !== undefined && currentTechnologicalDetail.value.id !== null && currentTechnologicalDetail.value.id !== 'undefined') {
         form.value.technologicalProcessDetailId = currentTechnologicalDetail.value.id
     }
+
     form.value.drawingName = coverName.value
 
     var itemList = []
@@ -404,7 +439,7 @@ function saveDrawingDetail() {
             reset();
             getList();
             formLoading.value = false
-
+            open.value = false
         }
     })
 }
@@ -431,16 +466,17 @@ function reset() {
         drawingName: null,
         type: false
     };
-    currentProduct.value = {}
     currentTechnologicalDetail.value = {}
-    currentTechnological.value = {}
     coverName.value = ''
     repeatingDrawings.value = []
     proxy.resetForm("drawingRef");
 }
 // 取消按钮
 function cancel() {
+    uploadrefss.value.clearFiles()
+
     open.value = false
+
     reset()
 }
 /**版本change事件 */

src/views/business/drawingAuditing/index.vue

@@ -77,6 +77,11 @@
                         <el-table-column label="工序" prop="processAlias" align="center" />
                         <el-table-column label="图纸" prop="drawingName" align="center" />
                         <el-table-column label="类型" prop="pattern" align="center" />
+                        <el-table-column label="状态" width="80px" prop="status" align="center">
+                                <template #default="scope">
+                                    <dict-tag :options="drawing_status" :value="scope.row.status" />
+                                </template>
+                            </el-table-column>
                         <el-table-column label="制作人" prop="producer" align="center" />
                         <el-table-column label="操作" width="150" align="center">
                             <template #default="scope">
@@ -116,6 +121,8 @@ const { yes_no } = proxy.useDict("yes_no");
 const drawingTabel = ref(null)
 const selections = ref([]);
 const total = ref(0);
+const { drawing_status } = proxy.useDict("drawing_status");
+
 const drawingList = ref([]);
 const loading = ref(false);
 const patternLabels = ref([{

src/views/business/drawingRatify/index.vue

@@ -77,6 +77,11 @@
                         <el-table-column label="工序" prop="processAlias" align="center" />
                         <el-table-column label="图纸" prop="drawingName" align="center" />
                         <el-table-column label="类型" prop="pattern" align="center" width="60"/>
+                        <el-table-column label="状态" width="80px" prop="status" align="center">
+                                <template #default="scope">
+                                    <dict-tag :options="drawing_status" :value="scope.row.status" />
+                                </template>
+                            </el-table-column>
                         <el-table-column label="制作人" prop="producer" align="center" width="100"/>
                         <el-table-column label="审核人" prop="reviewer" align="center" width="100"/>
                         <el-table-column label="操作" width="150" align="center">
@@ -113,6 +118,8 @@ const { proxy } = getCurrentInstance();
 const webHost = import.meta.env.VITE_APP_PRODUCTION_API;
 /**字典数组 */
 const { equipment_status } = proxy.useDict("equipment_status");
+const { drawing_status } = proxy.useDict("drawing_status");
+
 const { yes_no } = proxy.useDict("yes_no");
 const drawingTabel = ref(null)
 const selections = ref([]);
@@ -129,7 +136,7 @@ const patternLabels = ref([{
 const data = reactive({
     queryParams: {
         status: 1,
-        abandoned:1,
+        abandoned:0,
         pageNum: 1,
         pageSize: 10,
     },

src/views/business/electronicDrawings/index.vue

@@ -189,6 +189,7 @@ function handleQueryProduct() {
 	getList()
 }
 function handleProduct(row) {
+	technologicalprocessDetailList.value = []
 	openVersoinForm.value = true
 	currentTechnological.value = {}
 	console.log(row)
@@ -198,6 +199,12 @@ function handleProduct(row) {
 	getTechnological(technological).then(res => {
 		if (res.code == 200) {
 			technologicalProcessList.value = res.data
+			
+			if(technologicalProcessList.value.length>0){
+				currentProduct.value.technologicalprocessId = technologicalProcessList.value[0].value
+				currentTechnological.value.id = technologicalProcessList.value[0].value
+				handelDetails()
+			}
 		}
 	})