2025-04-17

src/views/modules/proofing/requestForProofing.vue

@@ -26,19 +26,16 @@
           v-model="searchData.startDate"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="选择日期">
+          placeholder="开始日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label=" ">
-        <div style="text-align: center;"><i class="el-icon-right"></i></div>
-      </el-form-item>
       <el-form-item :label="' '">
         <el-date-picker
           style="width: 120px"
           v-model="searchData.endDate"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="选择日期">
+          placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
     </el-form>

src/views/modules/quotation/requestForQuote.vue

@@ -29,19 +29,16 @@
           v-model="searchData.startDate"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="选择日期">
+          placeholder="开始日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label=" ">
-        <div style="text-align: center;"><i class="el-icon-right"></i></div>
-      </el-form-item>
       <el-form-item :label="' '">
         <el-date-picker
           style="width: 120px"
           v-model="searchData.endDate"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="选择日期">
+          placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
     </el-form>

src/views/modules/quotation/toBeQuoted.vue

@@ -26,19 +26,16 @@
             style="width: 120px"
             v-model="searchData.startDate"
             type="date"
-            placeholder=" ">
+            placeholder="开始日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label=" " v-if="defaultFlag">
-          <div style="text-align: center;"><i class="el-icon-right"></i></div>
-        </el-form-item>
         <el-form-item label=" " v-if="defaultFlag">
           <el-date-picker
             value-format="yyyy-MM-dd"
             style="width: 120px"
             v-model="searchData.endDate"
             type="date"
-            placeholder=" ">
+            placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
       </div>
@@ -157,14 +154,20 @@
         <el-table-column label="状态" header-align="center" align="center" prop="quotationStatus" min-width="80"/>
         <el-table-column label="申请单号" header-align="center" align="center" prop="quotationNo" min-width="120"/>
         <el-table-column label="项目编码" header-align="center" align="left" prop="projectId" min-width="100"/>
-        <el-table-column label="项目名称" header-align="center" align="left" prop="projectName" min-width="120"/>
-        <el-table-column label="物料编码" header-align="center" align="left" prop="testPartNo" min-width="200"/>
+        <el-table-column label="项目名称" header-align="center" align="left" prop="projectName" min-width="150"/>
+        <el-table-column label="物料编码" header-align="center" align="left" prop="testPartNo" min-width="120"/>
         <el-table-column label="物料名称" header-align="center" align="left" prop="partName" min-width="220"/>
         <el-table-column label="MOQ" header-align="center" align="right" prop="qty" min-width="80">
           <template slot-scope="scope">
             <el-input-number v-model="scope.row.qty" :controls="false" :min="0" :step="0"></el-input-number>
           </template>
         </el-table-column>
+        <el-table-column label="币种" header-align="center" align="center" prop="currency" min-width="80">
+          <template slot-scope="scope">
+            <dict-data-select v-model="scope.row.currency"
+                              clearable dict-type="plm_customer_information_customer_customer_currency" :use-default-value="false"></dict-data-select>
+          </template>
+        </el-table-column>
       </el-table>
 
       <el-footer style="height: 30px;line-height:30px;text-align: center">
@@ -180,8 +183,10 @@ import {
   quotationInformationSearch, // 询价信息列表查询
 } from '@/api/quotation/quotationInformation.js'
 import {batchSaveQuote} from "../../../api/quote/quote";
+import DictDataSelect from "../sys/dict-data-select.vue";
 export default {
   name:"toBeQuoted",
+  components: {DictDataSelect},
   props:{
     defaultFlag:{
       type:Boolean,
@@ -628,6 +633,7 @@ export default {
       }
       this.quotationSelections = this.quotationSelections.map(item=>{
         item.qty = undefined
+        item.currency = undefined
         item.createBy = this.$store.state.user.name
         item.site = this.$store.state.user.site
         return item;

src/views/modules/quote/primary/quoteSearch.vue

@@ -78,13 +78,14 @@ export default {
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="3">
           <el-form-item label="报价日期">
-            <div style="display: flex">
-              <el-date-picker style="width: 47%" v-model="quote.startDate" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd'></el-date-picker>
-              <div style="width: 6%;text-align: center">-</div>
-              <el-date-picker style="width: 47%" v-model="quote.endDate" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd'></el-date-picker>
-            </div>
+            <el-date-picker style="width: 100%" placeholder="开始日期" v-model="quote.startDate" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd'></el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <el-form-item label=" ">
+            <el-date-picker style="width: 100%" placeholder="结束日期" v-model="quote.endDate" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd'></el-date-picker>
           </el-form-item>
         </el-col>
         <el-col :span="3">

src/views/modules/test/requestForTest.vue

@@ -29,19 +29,16 @@
           v-model="searchData.startDate"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="选择日期">
+          placeholder="开始日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label=" ">
-        <div style="text-align: center;"><i class="el-icon-right"></i></div>
-      </el-form-item>
       <el-form-item :label="' '">
         <el-date-picker
           style="width: 120px"
           v-model="searchData.endDate"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="选择日期">
+          placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
     </el-form>