2024-04-08

src/api/test/testProperties.js

@@ -4,3 +4,4 @@ export const getTestPropertiesList = (data)=>createAPI(`/test/properties/list`,'
 export const updateTestPropertiesList = (data)=>createAPI(`/test/properties/update`,'post',data)
 export const searchTestPropertiesList = (data)=>createAPI(`/test/properties/search`,'post',data)
 export const searchModalDetails = (data)=>createAPI(`/properties/searchModalDetails`,'post',data)
+export const searchTestPropertiesItem = (data)=>createAPI(`/test/properties/item`,'post',data)

src/views/modules/test/requestForTest.vue

@@ -200,7 +200,7 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="印刷方式" prop="printType">
-              <dict-data-select v-if="modalFlag" v-model="modalData.printType" dict-type="print_type"></dict-data-select>
+              <dict-data-select v-if="modalFlag" clearable v-model="modalData.printType" dict-type="print_type"></dict-data-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -305,12 +305,13 @@
         </el-row>
       </el-form>
       <div class="rq">
+        <el-button v-if="!modalData.testNo" @click="saveData" plain type="primary" style="position:absolute;margin-top: 10px;margin-right: 10px;right: 0;z-index: 1">下一步</el-button>
         <el-tabs v-model="activeTab" @tab-click="dialogTabClick">
           <el-tab-pane label="基本信息" :disabled="!activeTabList.includes('attribute')" name="attribute" v-if="modalData.flag !== '1'">
             <test-properties v-if="modalFlag" v-model:data-list="testPropertiesList" ref="dialogTestAttribute" :test-no="modalData.testNo"></test-properties>
           </el-tab-pane>
           <el-tab-pane label="基本信息" :disabled="!activeTabList.includes('attribute')" name="attribute" v-else>
-            <test-properties v-if="modalFlag" :show-save-button="modalData.flag !== '1'" v-model:data-list="copyTestPropertiesList" ref="dialogTestAttribute" :test-no="modalData.testNo"></test-properties>
+            <test-properties v-if="modalFlag" v-model:data-list="copyTestPropertiesList" ref="dialogTestAttribute" :test-no="modalData.testNo"></test-properties>
           </el-tab-pane>
           <el-tab-pane label="物料属性" :disabled="!activeTabList.includes('partAttribute')" name="partAttribute">
             <test-attribute v-if="modalFlag" :attribute-list="dialogProperties" ref="dialogAttribute" :test-no="modalData.testNo"></test-attribute>
@@ -390,7 +391,7 @@
         </el-tabs>
       </div>
       <el-footer style="height:30px;text-align:center;margin-top: 8px">
-        <el-button type="primary" @click="saveData()" >保存</el-button>
+        <el-button type="primary" @click="saveData()" v-if="modalData.flag !== '1'">保存</el-button>
         <el-button type="primary" @click="modalFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
@@ -1098,7 +1099,7 @@
   import TestAttribute from "./testSoAttribute/testAttribute.vue";
   import {partPropertiesList} from "../../../api/base/properties";
   import TestProperties from "./testAttribute/testProperties.vue";
-  import {getTestPropertiesList} from "../../../api/test/testProperties";
+  import {getTestPropertiesList,searchTestPropertiesItem} from "../../../api/test/testProperties";
   import TestFile from "./file/testFile.vue";
   export default {
     name:"test",
@@ -2111,6 +2112,21 @@
       this.getDataList()
     },
     methods: {
+      searchTestPropertiesItem(){
+        let params={
+          site:this.$store.state.user.site,
+        }
+        this.copyTestPropertiesList = [];
+        searchTestPropertiesItem(params).then(({data}) => {
+          if (data && data.code === 0){
+            this.copyTestPropertiesList = data.rows;
+          }else {
+            this.$message.warning(data.msg)
+          }
+        }).catch((error)=>{
+          this.$message.error(error)
+        })
+      },
       // ======== 分页相关方法 ========
       /**
        * 每页数
@@ -2320,6 +2336,7 @@
        * 报价信息新增模态框
        */
       addModal () {
+        this.searchTestPropertiesItem();
         this.modalDisableFlag = false
         this.modalFlag = true
       },
@@ -2514,8 +2531,9 @@
             this.getDataList();
             this.activeTabList = ['product','process','attribute','partAttribute','file']
             this.activeTab = 'attribute'
-            this.modalData.testNo = data.row
+            this.modalData.testNo = data.row;
             // this.modalFlag = false
+            this.getTestProperties();
             this.$message.success("操作成功")
           } else {
             this.$alert(data.msg, '错误', {
@@ -3168,6 +3186,9 @@
         getTestPropertiesList(params).then(({data})=>{
           if (data && data.code === 0){
             this.testPropertiesList = data.rows;
+            if (this.modalFlag){
+              this.copyTestPropertiesList = data.rows;
+            }
           }else {
             this.$message.warning(data.msg)
           }

src/views/modules/test/testAttribute/testProperties.vue

@@ -26,10 +26,6 @@ export default {
       type:Number,
       default:300
     },
-    showSaveButton:{
-      type:Boolean,
-      default:true
-    }
   },
   model:{
     prop:"dataList",
@@ -40,6 +36,7 @@ export default {
       loading:false,
       attributeDialog:true,
       copyAttributeList:[],
+      attributeSaveDialog:false,
       productColumnList: [
         {
           userId: this.$store.state.user.name,
@@ -203,6 +200,7 @@ export default {
       updateTestPropertiesList(this.copyAttributeList).then(({data})=>{
         if (data && data.code === 0){
           this.$message.success(data.msg);
+          this.$emit("change",this.copyAttributeList)
           this.getTestProperties();
           this.attributeDialog = true;
         }else {
@@ -224,7 +222,7 @@ export default {
     },
     clickSaveBtn(){
       //查询 属性模板
-
+      this.attributeSaveDialog = true;
     }
   },
 }
@@ -233,8 +231,8 @@ export default {
 <template>
 <div>
   <div style="margin-top: 5px">
-    <el-button type="primary" @click="clickSaveBtn">新增</el-button>
-    <el-button type="primary" :loading="loading" v-if="showSaveButton" @click="clickSave">{{ attributeDialog?'编辑':'保存' }}</el-button>
+    <el-button type="primary" @click="clickSaveBtn" v-if="testNo">新增</el-button>
+    <el-button type="primary" :loading="loading" v-if="testNo" @click="clickSave">{{ attributeDialog?'编辑':'保存' }}</el-button>
   </div>
   <div class="rq " v-if="attributeDialog">
     <el-table
@@ -287,7 +285,7 @@ export default {
           </div>
           <div v-else>
             <div v-if="scope.row.valueChooseFlag !== 'Y'">
-              <el-input-number v-model="scope.row.numValue" style="margin-top: -6px;padding: 0;width: 100%" v-if="scope.row.valueType === '数字'" :controls="false"></el-input-number>
+              <el-input-number v-model="scope.row.numValue" style="padding: 0;width: 100%" v-if="scope.row.valueType === '数字'" :controls="false"></el-input-number>
               <el-input v-model="scope.row.numValue" v-else></el-input>
             </div>
             <div v-else>
@@ -303,6 +301,18 @@ export default {
       </el-table-column>
     </el-table>
   </div>
+  <el-dialog title="属性项目" v-drag :visible.sync="attributeSaveDialog" append-to-body>
+    <el-row :gutter="20">
+      <!--表格1-->
+      <el-col :span="8"></el-col>
+      <!--按钮-->
+      <el-col :span="8"></el-col>
+      <!--表格2-->
+      <el-col :span="8">
+
+      </el-col>
+    </el-row>
+  </el-dialog>
 </div>
 </template>
 
@@ -311,4 +321,8 @@ export default {
   text-align: right;
   padding-right: 5px !important;
 }
+
+/deep/ .el-input .el-input--medium{
+  line-height: 20px;
+}
 </style>