'123'

ABAP_AS_WITH_POOL.jcoDestination

@@ -1,5 +1,5 @@
 #for tests only !
-#Thu Jul 04 15:05:23 CST 2024
+#Fri Jul 05 09:06:58 CST 2024
 jco.destination.pool_capacity=10
 jco.client.lang=ZH
 jco.client.ashost=172.19.0.125
@@ -7,5 +7,5 @@ jco.client.saprouter=
 jco.client.user=RFC
 jco.client.sysnr=00
 jco.destination.peak_limit=10
-jco.client.passwd=654321
+jco.client.passwd=w*-uy]U3Wh]qqBBh_@He72CAdEX)_WU]ErNsU17||5aw7eD7
 jco.client.client=800

ruoyi-ui/src/views/quot/quot/index.vue

@@ -519,8 +519,9 @@
 
         <el-divider content-position="left" class="customer_divider_text">产品信息</el-divider>
         <div style="margin-bottom: 10px">
+          <el-button v-if="checkRole(['QUOT','PRICE_VERIFICATION'])" type="primary" icon="el-icon-plus" size="mini" @click="handleAddQuotMaterial">新增</el-button>
           <el-button v-if="checkRole(['SALES_MAN','QUOT','PRICE_VERIFICATION'])" type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteQuotMaterial">删除</el-button>
-          <el-button v-if="checkRole(['QUOT','PRICE_VERIFICATION'])" type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport">导入</el-button>
+          <el-button v-if="checkRole(['QUOT','PRICE_VERIFICATION'])" type="info" plain icon="el-icon-download" size="mini" @click="handleImport">导入</el-button>
           <el-select style="float: right;width:230px" size="mini" v-model="form.quotRbDateUid" :disabled="true">
             <el-option
               v-for="item in versionList"
@@ -535,32 +536,32 @@
           <el-table-column label="序号" align="center" prop="index" width="50"/>
           <el-table-column label="型号" prop="matXingh" width="180">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.matXingh" placeholder="型号" :disabled="true"/>
+              <el-input v-model="scope.row.matXingh" placeholder="型号" :disabled="scope.row.matId"/>
             </template>
           </el-table-column>
           <el-table-column label="规格" prop="matGuig" width="150">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.matGuig" placeholder="规格" :disabled="true"/>
+              <el-input v-model="scope.row.matGuig" placeholder="规格" :disabled="scope.row.matId"/>
             </template>
           </el-table-column>
           <el-table-column label="电压" prop="matDiany" width="130">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.matDiany" placeholder="电压" :disabled="true"/>
+              <el-input v-model="scope.row.matDiany" placeholder="电压" :disabled="scope.row.matId"/>
             </template>
           </el-table-column>
           <el-table-column label="单位" prop="matDanw" width="100">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.matDanw" placeholder="单位" :disabled="true"/>
+              <el-input v-model="scope.row.matDanw" placeholder="单位" :disabled="scope.row.matId"/>
             </template>
           </el-table-column>
           <el-table-column label="数量" prop="matSl" width="100">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.matSl" placeholder="数量" :disabled="true"/>
+              <el-input v-model="scope.row.matSl" placeholder="数量" :disabled="scope.row.matId"/>
             </template>
           </el-table-column>
           <el-table-column label="备注" prop="matRemark" width="180">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.matRemark" placeholder="备注" :disabled="true"/>
+              <el-input v-model="scope.row.matRemark" placeholder="备注" :disabled="scope.row.matId"/>
             </template>
           </el-table-column>
           <el-table-column label="料单价" prop="matMatprice" v-if="checkRole(['QUOT_MAT_PRICE_DIFF'])" width="130">
@@ -1232,6 +1233,13 @@ export default {
       //this.queryParams.quotApprovalStatus = '0';
     }
     this.getList();
+
+    // 红本报价生成询价单自动打开详情页
+    const param = this.$route.query;
+    if (param.quotId !== undefined && param.quotId !== null) {
+      const row = {'quotId':param.quotId};
+      this.handleUpdate(row);
+    }
   },
   methods: {
     /** 打印状态修改 */

ruoyi-ui/src/views/redBook/productSelect.vue

@@ -818,6 +818,14 @@
               madeXjQuot(this.form).then(response => {
                 this.$modal.msgSuccess("生成询价单成功,单号:"+response.data.quotCode);
                 this.madeQuotDis = false;
+
+                // 跳转至询价单列表页面并打开详情页
+                const info = {quotId : response.data.quotId};
+                this.$router.push({
+                  path:'/quot/quot/index',
+                  name: 'Quot',
+                  query: info
+                })
               });
             }
           },

ruoyi-ui/src/views/redBook/quots.vue

@@ -43,7 +43,7 @@
       </el-table-column>
       <el-table-column label="报价客户" width="250" align="center" prop="quotCustomer" />
       <el-table-column label="报价项目" width="250" align="center" prop="quotProject" />
-      <el-table-column label="总价" width="100" align="center" prop="totalPrice" />
+      <el-table-column label="总价" width="150" align="center" prop="totalPrice" />
       <el-table-column label="联系人" align="center" prop="quotLxr" />
       <el-table-column label="联系人电话" width="100" align="center" prop="quotLxrdh" />
       <el-table-column label="创建人" width="180" align="center" prop="createName" />