Merge branch 'main' of http://jialcheerful.club:3000/xd/JNBusiness

ABAP_AS_WITH_POOL.jcoDestination

@@ -1,5 +1,5 @@
 #for tests only !
-#Mon Jun 24 15:12:56 CST 2024
+#Tue Jun 25 11:00:35 CST 2024
 jco.destination.pool_capacity=10
 jco.client.lang=ZH
 jco.client.ashost=172.19.0.125

ruoyi-ui/src/views/components/Tools/Mobile/CustomerSelect/index.vue

@@ -1,7 +1,7 @@
 <template>
   <el-dialog
-    :width="width || '900px'"
+    :width="100 + '%'"
-    :height="height || '400px'"
+    :style="{ height: '100%'}"
     :visible.sync="open"
     :show-close="false" append-to-body>
     <div slot="title"  style="margin: 0px; padding: 0px">
@@ -17,9 +17,13 @@
         <el-form-item >
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"> 搜索 </el-button>
         </el-form-item>
+        <el-form-item class="button-group">
+          <el-button type="primary" @click="confirm" :disabled="single">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </el-form-item>
       </el-form>
     </div>
-    <el-table v-loading="loading" ref="table" :data="pagedData" @selection-change="handleSelectionChange" height="300">
+    <el-table v-loading="loading" ref="table" :data="pagedData" @selection-change="handleSelectionChange" height="420">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column align="center">
         <template slot-scope="scope">
@@ -40,10 +44,6 @@
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
     />
-    <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="confirm" :disabled="single">确 定</el-button>
-      <el-button @click="cancel">取 消</el-button>
-    </div>
   </el-dialog>
 </template>
 
@@ -151,6 +151,10 @@ export default {
 }
 </script>
 
-<style scoped>
+<style>
+.button-group {
+  display: flex;
+  justify-content: flex-end; /* 按钮靠右对齐 */
+}
 
 </style>

ruoyi-ui/src/views/mobile/quoteMobile/index.vue

@@ -43,11 +43,10 @@
       </div>
     </div>
       <div v-loading="loading" v-for="(quote, index) in quoteList" :key="index">
-        <div style="padding: 10px">
+        <div style="padding: 10px" @click="handleEdit(quote)">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
-              <span @click="handleEdit(quote)">{{quote.quotCode}}</span>
+              <span style="color: blue; text-decoration: underline; cursor: pointer;" >{{quote.quotCode}}</span>
-              <el-button style="float: right; padding: 3px; " type="text" @click="handleEdit(quote)">编辑</el-button>
             </div>
             <div class="text item">
               <div v-if="false">订单号Id:{{quote.quotId}}</div>

ruoyi-ui/src/views/mobile/quoteMobile/operation/add.vue

@@ -8,18 +8,7 @@
       </el-form-item>
       <el-form-item label="询价单单号" prop="quotCode">
         <el-input v-model="formData.quotCode" placeholder="报价单单号(自动生成)" readonly clearable
-                  ></el-input>
+        ></el-input>
-      </el-form-item>
-      <el-form-item label="客户" prop="quotCustomerName">
-        <el-input readonly v-model="formData.quotCustomerName" placeholder="请输入客户" >
-          <template slot="append">
-            <span v-if="!isVIf"  @click="openCustomer">选择</span>
-          </template>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="地址" prop="quotAddress">
-        <el-input :readonly="isReadOnly" v-model="formData.quotAddress" placeholder="请输入地址" clearable>
-        </el-input>
       </el-form-item>
       <el-form-item v-if="formData.quotApprovalStatus !== undefined" label="提交状态" prop="quotApprovalStatus">
         <el-input readonly
@@ -29,15 +18,31 @@
                   placeholder="保存后显示" clearable
         ></el-input>
       </el-form-item>
+      <el-form-item label="客户" prop="quotCustomerName">
+        <el-input readonly v-model="formData.quotCustomerName" placeholder="请输入客户" >
+          <template slot="append">
+            <span v-if="!isVIf"  @click="openCustomer">选择</span>
+          </template>
+        </el-input>
+      </el-form-item>
       <el-form-item label="项目名称" prop="quotProject">
         <el-input :readonly="isReadOnly" v-model="formData.quotProject" placeholder="请输入项目名称" clearable >
         </el-input>
       </el-form-item>
+      <el-form-item label="报价要求" prop="quotQuotationRequire">
+        <el-input type="textarea" autosize :readonly="isReadOnly" v-model="formData.quotQuotationRequire" placeholder="请输入报价要求" clearable
+        ></el-input>
+      </el-form-item>
+
+      <el-form-item label="地址" prop="quotAddress">
+        <el-input :readonly="isReadOnly" v-model="formData.quotAddress" placeholder="请输入地址" clearable>
+        </el-input>
+      </el-form-item>
       <el-form-item  v-if="this.formData.quotApprovalStatus == '2' || this.formData.quotApprovalStatus == '3'" label="反馈说明" prop="quotApprovalStatus">
         <el-input type="textarea" autosize readonly v-model="formData.quotFeedbackExplanation" placeholder="反馈说明" clearable >
         </el-input>
       </el-form-item>
-      <el-form-item v-if="this.formData.quotApprovalStatus !== '0' || this.formData.quotApprovalStatus !== undefined" label="OA审批状态" prop="quotApprovalStatus">
+      <el-form-item v-if="formData.quotApprovalStatus !== undefined" label="OA审批状态" prop="quotApprovalStatus">
         <el-input readonly
                   :value="formData.quotOAApprovalStatus === undefined ? '' :(formData.quotOAApprovalStatus === '0' ? '待提交' :
                       (formData.quotOAApprovalStatus === '1' ? '协助中' :
@@ -48,19 +53,12 @@
       <el-form-item  v-if="this.formData.quotOAApprovalStatus == '2' || this.formData.quotOAApprovalStatus == '3'" label="OA审批说明" prop="quotOAApprovalStatusRemark">
         <el-input type="textarea" autosize readonly v-model="formData.quotOAApprovalStatusRemark" placeholder="OA审批说明" clearable >
         </el-input>
-      </el-form-item>
-        <el-form-item label="报价要求" prop="quotQuotationRequire">
-        <el-input type="textarea" autosize :readonly="isReadOnly" v-model="formData.quotQuotationRequire" placeholder="请输入报价要求" clearable
-                  ></el-input>
       </el-form-item>
       <el-form-item label="联系电话" prop="quotPhone">
         <el-input :readonly="isReadOnly" v-model="formData.quotPhone" placeholder="请输入联系电话" clearable >
         </el-input>
       </el-form-item>
-
+      <el-divider content-position="left" ><span style="color: blue;">清单附件(先保存再上传且必须是EXCEL文件)</span></el-divider>
-
-
-      <el-divider content-position="left" >清单附件(先保存再上传且必须是EXCEL文件)</el-divider>
       <div v-hasPermi="['quot:quot:quotXjFile']">
         <el-upload class="upload-demo"
                    ref="quotXjFileUpload"
@@ -90,7 +88,7 @@
         </el-table-column>
       </el-table>
 
-      <el-divider content-position="left">技术附件(先保存再上传,如包含清单附件则不受理)</el-divider>
+      <el-divider content-position="left"><span style="color: blue;">技术附件(先保存再上传,如包含清单附件则不受理)</span></el-divider>
       <div v-hasPermi="['quot:quot:quotJsgfFile']">
         <el-upload class="upload-demo"
                    ref="quotJsgfFileUpload"
@@ -177,13 +175,15 @@
         </el-table-column>
       </el-table>
       <div style="margin-top: 5px" v-hasPermi="['quot:quot:madeQuot']"><el-button type="warning" plain @click="madeQuot" v-if="this.formData.quotApprovalStatus == '2'">生成报价单</el-button></div>
-      <el-form-item style="margin-top: 15px">
+      <div v-if="this.formData.quotApprovalStatus == '0' || this.formData.quotApprovalStatus == null" class="fixed-buttons-container">
-        <span v-hasPermi="['quot:quot:save']"><el-button @click="saveForm" v-if="this.formData.quotApprovalStatus == '0' || this.formData.quotApprovalStatus == null">保 存</el-button></span>
+        <el-form-item style="margin-top: 10px">
-        <span style="margin-left: 10px" v-hasPermi="['quot:quot:commit']"><el-button type="primary" plain @click="commitForm" v-if="this.formData.quotApprovalStatus == '0' || this.formData.quotApprovalStatus == null">提 交</el-button></span>
+          <span v-hasPermi="['quot:quot:save']"><el-button @click="saveForm" v-if="this.formData.quotApprovalStatus == '0' || this.formData.quotApprovalStatus == null">保 存</el-button></span>
-      </el-form-item>
+          <span style="margin-left: 10px" v-hasPermi="['quot:quot:commit']"><el-button type="primary" plain @click="commitForm" v-if="this.formData.quotApprovalStatus == '0' || this.formData.quotApprovalStatus == null">提 交</el-button></span>
+        </el-form-item>
+      </div>
     </el-form>
 
-    <CustomerSelect :width="100 + '%'" :height="100 + '%'" ref="customerSelect" :open="customerOpen" @submit="submitCustomer" @cancel="customerOpen=false"></CustomerSelect>
+    <CustomerSelect ref="customerSelect" :open="customerOpen" @submit="submitCustomer" @cancel="customerOpen=false"></CustomerSelect>
     <!-- 产品导入对话框 -->
     <el-dialog :title="productUpload.title" :visible.sync="productUpload.open" width="400px" append-to-body>
       <el-upload
@@ -681,6 +681,14 @@ export default {
 
 </script>
 <style>
+.fixed-buttons-container {
+  position: fixed;
+  bottom: 0;
+  width: 90%;
+  background-color: #fff; /* 背景颜色，根据你的页面设计调整 */
+  box-shadow: 0 -2px 10px rgba(0, 0, 0, 0.1); /* 阴影效果，根据需要调整 */
+  justify-content: center; /* 居中对齐 */
+}
 .small-upload .el-upload {
 
   width: 100px;