计量单位-交易项目明细模糊查询

precision-effect-system/src/main/resources/mapper/business/TTradeProjectMapper.xml

@@ -119,6 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
             <if test="queryApplyDeptId != null">and apply_dept_id = #{queryApplyDeptId}</if>
             <if test="queryTradeDeptId != null">and trade_dept_id = #{queryTradeDeptId}</if>
+            <if test="transactionDetailName != null">and transaction_detail_name like concat('%', #{transactionDetailName}, '%')</if>
         </where>
         order by update_time,create_time desc
     </select>

precision-effect-web/src/views/trade/components/TableList.vue

@@ -8,6 +8,17 @@
         :formatter="transactionProjectName"
         :show-overflow-tooltip="true"
       />
+      <el-table-column
+        label="交易细项名称"
+        align="center"
+        prop="transactionDetailName"
+        :show-overflow-tooltip="true"
+      >
+        <template slot-scope="scope">
+          <span v-if="scope.row.transactionDetailName">{{scope.row.transactionDetailName}}</span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="交易状态"
         align="center"

precision-effect-web/src/views/trade/index.vue

@@ -8,8 +8,8 @@
       v-show="showSearch"
       label-width="100px"
     >
-      <el-form-item label="交易项目" prop="relationTransactionProjectId">
-        <el-select
+      <el-form-item label="交易细项名称" prop="transactionDetailName">
+        <!--<el-select
           v-model="queryParams.relationTransactionProjectId"
           placeholder="请选择交易项目"
         >
@@ -19,7 +19,16 @@
             :label="item.transactionProjectName"
             :value="item.transactionProjectId"
           />
-        </el-select>
+        </el-select>-->
+
+        <el-input
+          v-model="queryParams.transactionDetailName"
+          placeholder="请输入交易细项名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+
       </el-form-item>
       <el-form-item label="项目状态" prop="tradeStatus">
         <el-select
@@ -239,6 +248,13 @@
        </el-row>
 
        <el-row>
+         
+         <el-col :span="12">
+           <el-form-item label="计量单位">
+             <el-input v-model="form.unit" placeholder="请输入计量单位" disabled/>
+           </el-form-item>
+         </el-col>
+
          <el-col :span="12">
            <el-form-item v-if="priceType == '1'" label="单价" prop="tradePrice" >
              <el-input v-model="form.tradePrice" placeholder="请输入单价" :disabled="true" @blur="sumAmount"/>
@@ -251,23 +267,21 @@
              <el-input v-model="form.tradePrice" placeholder="请输入单价" :disabled="true" @blur="sumAmount"/>
            </el-form-item>
          </el-col>
-         <el-col :span="12">
-           <el-form-item label="数量" v-if="priceType == '1'" prop="tradeCount">
-             <el-input v-model="form.tradeCount" placeholder="请输入交易数量" @blur="sumAmount" :disabled="priceType == '2'"/>
-           </el-form-item>
-           <el-form-item label="数量" v-if="priceType == '2'" prop="tradeCount" :rules="[
-          { required: false, message:'数量不能为空', trigger: 'blur' }
-           ]" >
-             <el-input v-model="form.tradeCount" placeholder="请输入交易数量" @blur="sumAmount" :disabled="priceType == '2'"/>
-           </el-form-item>
-         </el-col>
+
        </el-row>
         <el-row>
+
           <el-col :span="12">
-            <el-form-item label="单位">
-              <el-input v-model="form.unit" placeholder="请输入单位" disabled/>
+            <el-form-item label="数量" v-if="priceType == '1'" prop="tradeCount">
+              <el-input v-model="form.tradeCount" placeholder="请输入交易数量" @blur="sumAmount" :disabled="priceType == '2'"/>
+            </el-form-item>
+            <el-form-item label="数量" v-if="priceType == '2'" prop="tradeCount" :rules="[
+          { required: false, message:'数量不能为空', trigger: 'blur' }
+           ]" >
+              <el-input v-model="form.tradeCount" placeholder="请输入交易数量" @blur="sumAmount" :disabled="priceType == '2'"/>
             </el-form-item>
           </el-col>
+
           <el-col :span="12">
             <el-form-item label="总价" prop="tradeTotal">
               <el-input v-model="form.tradeTotal" placeholder="请输入交易总价" :disabled="priceType == '1'"/>
@@ -378,6 +392,7 @@ export default {
         pageSize: 10,
         queryType: "all",
         relationTransactionProjectId: null,
+        transactionDetailName: null,
         applyDeptId: null,
         tradeType: null,
         tradeDeptId: null,

precision-effect-web/src/views/transaction/index.vue

@@ -96,7 +96,7 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="单位" align="center" prop="unit">
+      <el-table-column label="计量单位" align="center" prop="unit">
         <template slot-scope="scope">
           <span v-if="scope.row.price">{{scope.row.unit}}</span>
           <span v-else>-</span>
@@ -179,7 +179,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="单位" prop="unit">
+            <el-form-item label="计量单位" prop="unit">
               <el-input v-model="form.unit" placeholder="请输入单位"/>
             </el-form-item>
           </el-col>