2025-04-24

src/views/modules/proofing/requestForProofing.vue

@@ -235,7 +235,7 @@
             </el-row>
           </el-col>
           <el-col :span="4">
-            <el-form-item :show-message="false">
+            <el-form-item :show-message="false" prop="trackerName">
               <label v-if="columnFlagByHeader('tracker') || detailVisible" slot="label">CS</label>
               <span v-else style="cursor: pointer" slot="label" @click="getBaseList(2051)"><a herf="#">CS</a></span>
               <el-input v-model="modalData.trackerName" :disabled="columnFlagByHeader('tracker') || detailVisible" readonly>
@@ -251,7 +251,7 @@
                 <span slot="suffix" v-show="modalData.engineerName && !detailVisible" @click="clearModalData('engineer')"><i class="el-icon-circle-close" style="margin-left: 5px;cursor: pointer;"></i></span>
               </el-input>
             </el-form-item>
-          </el-col>
+          </el-col>`
           <el-col :span="4">
             <el-form-item>
               <label v-if="columnFlagByHeader('approver') || detailVisible" slot="label">Approver</label>
@@ -2597,9 +2597,14 @@ export default {
 
       this.$refs.modalForm.validate((valid, obj) => {
         if (!valid) {
-          Object.keys(obj).forEach(val => {
-            this.$message.warning(obj[val][0].message)
-          })
+          let i = 1;
+          for (let key in obj) {
+            this.$message.error(obj[key][0].message);
+            if (i === 1){
+              return
+            }
+            i++;
+          }
         } else {
           if (this.projectPartListSelections.length <= 0) {
             this.$message.warning('请选择项目料号')

src/views/modules/quote/detail/primary/quoteDetailCost.vue

@@ -131,7 +131,13 @@ export default {
       // if (this.selectionChecked.includes('包装&运输')){
       //   this.quoteDetail.totalCost += this.quoteDetail.otherCost;
       // }
+      // 计算成本
       this.computedTotalPartCost();
+      // let val = 0;
+      // let editInput = this.editInput.toLowerCase();
+      // if (editInput === 'va'){
+      //   val = this.quoteDetail.quoteProfitRate
+      // }
       this.computeProfitAmount();
       this.computeCurrencyTotalCost();
     },

src/views/modules/quote/detail/quoteDetail.vue

@@ -665,6 +665,9 @@ export default {
       exportName: '报价条目明细'+this.dayjs().format('YYYYMMDDHHmmss'),
       exportHeader: ["报价条目明细"],
       exportFooter: [],
+
+      againVisible:false,
+      againRow:{},
     }
   },
   methods:{
@@ -846,22 +849,40 @@ export default {
         this.$refs.tool.handleQueryQuoteDetailTool();
       }
     },
-    againQuoteDetail(row){
-      let params = {
-        ...row
-      }
+    handleAgainQuoteDetail(row){
+      this.againRow = row;
+      this.againVisible = true;
+    },
+    againQuoteDetail(){
+      this.$refs.againForm.validate((valid,obj) => {
+        if (valid){
           this.queryLoading = true;
-      againQuoteDetail(params).then(({data})=>{
+          this.saveLoading = true;
+          againQuoteDetail(this.againRow).then(({data})=>{
             if (data && data.code === 0){
+              this.againVisible = false
               this.handleQueryQuoteDetail();
               this.$message.success(data.msg);
             }else {
               this.$message.warning(data.msg);
-          this.queryLoading = false;
             }
+            this.queryLoading = false;
+            this.saveLoading = false;
           }).catch((error)=>{
             this.$message.error(error);
             this.queryLoading = false;
+            this.saveLoading = false;
+          })
+        }else {
+          let i = 1;
+          for (let key in obj) {
+            this.$message.error(obj[key][0].message);
+            if (i === 1){
+              return
+            }
+            i++;
+          }
+        }
       })
     },
     handleQueryPartList(){
@@ -1040,7 +1061,8 @@ export default {
           <a type="text" v-if="row.status === '草稿'" @click="handleDeleteQuoteDetail(row)">删除</a>
         </template>
         <template v-if="isAuth('5011:detail:again')">
-          <a type="text" v-if="row.status !== '下达'" @click="againQuoteDetail(row)">复制明细</a>
+<!--          <a type="text" v-if="row.status !== '下达'" @click="againQuoteDetail(row)">复制明细</a>-->
+          <a type="text" v-if="row.status !== '下达'" @click="handleAgainQuoteDetail(row)">复制明细</a>
         </template>
         <template v-if="isAuth('5011:detail:detail')">
           <a type="text" v-if="row.status === '下达'" @click="handleDetail(row)">详情</a>
@@ -1197,6 +1219,37 @@ export default {
     </el-pagination>
   </el-dialog>
 
+  <el-dialog title="复制明细" v-drag append-to-body :close-on-click-modal="false" :visible.sync="againVisible" width="400px">
+    <el-form :model="againRow" label-position="top" ref="againForm" :rules="saveQuoteDetailRules">
+      <el-row :gutter="10">
+        <el-col :span="8">
+          <el-form-item label="物料编码" prop="partNo" :show-message="false">
+            <el-input v-model="againRow.partNo" disabled @change="handlePartNoBlur"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="16">
+          <el-form-item label="物料名称" prop="partDesc" :show-message="false">
+            <el-input v-model="againRow.partDesc" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="MOQ" prop="qty" :show-message="false">
+            <el-input-number style="width: 100%;"  v-model="againRow.qty" :min="1" :step="0" :precision="0" :controls="false"></el-input-number>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="币种" prop="currency1" :show-message="false">
+            <dict-data-select style="width: 100%" dict-type="plm_customer_information_customer_customer_currency" v-model="againRow.currency1"></dict-data-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" :loading="saveLoading" @click="againQuoteDetail">确 定</el-button>
+      <el-button @click="againVisible = false">取 消</el-button>
+    </div>
+  </el-dialog>
+
 <!--  <part-table v-if="saveVisible" v-model="partVisible" :is-page="true" :part-no="saveQuoteDetail.partNo" @dblclick="handleDblClick"></part-table>-->
 <!--  <project-part-table v-if="saveVisible" v-model="partVisible" :project-no="saveQuoteDetail.projectNo" :part-no="saveQuoteDetail.partNo" @dblclick="handleDblClick"></project-part-table>-->
 </div>