diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
index fe9dabb5ab..c2b539e805 100644
--- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
+++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
@@ -29,6 +29,14 @@
             </el-col>
           </el-row>
           <el-row>
+            <el-col :span="8">
+              <div class="span-sty"><span class="icon">*</span>科目</div>
+              <el-form-item prop="subjectName">
+                <el-select class="addinputInfo" v-model="formobj.subjectName" placeholder="请选择" @change="subjectChange" clearable filterable>
+                  <el-option v-for="item in subject_list" :key="item.subjectSid" :label="item.subjectName" :value="item.subjectName"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <div class="span-sty">车型</div>
               <el-form-item>
@@ -45,37 +53,33 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <div class="span-sty">备注</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.remarks" clearable placeholder="" /></el-form-item>
-            </el-col>
           </el-row>
           <el-row>
-            <el-col :span="8">
-              <div class="span-sty"><span class="icon">*</span>排序</div>
-              <el-form-item prop="sortNo"><el-input class="addinputInfo addinputw" @keyup.native="formobj.sortNo = getNumber(formobj.sortNo, 0)" v-model="formobj.sortNo" clearable placeholder="" /></el-form-item>
-            </el-col>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>工时单价</div>
-              <el-form-item prop="hourPrice"><el-input class="addinputInfo addinputw" @input="computeXSJ" @keyup.native="formobj.hourPrice = getNumber(formobj.hourPrice, 2)" v-model="formobj.hourPrice" clearable placeholder="" /></el-form-item>
+              <el-form-item prop="hourPrice"><el-input class="addinputInfo addinputw" @keyup.native="formobj.hourPrice = getNumber(formobj.hourPrice, 2)" v-model="formobj.hourPrice" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>工时数</div>
-              <el-form-item prop="hours"><el-input class="addinputInfo addinputw" @input="computeXSJ" @keyup.native="formobj.hours = getNumber(formobj.hours, 2)" v-model="formobj.hours" clearable placeholder="" /></el-form-item>
+              <el-form-item prop="hours"><el-input class="addinputInfo addinputw" @keyup.native="formobj.hours = getNumber(formobj.hours, 2)" v-model="formobj.hours" clearable placeholder="" /></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty"><span class="icon">*</span>外协成本</div>
+              <el-form-item prop="cost"><el-input class="addinputInfo addinputw" @keyup.native="formobj.cost = getNumber(formobj.cost, 2)" v-model="formobj.cost" clearable placeholder="" /></el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>销售价</div>
-              <el-form-item prop="price"><el-input class="addinputInfo addinputw" @keyup.native="formobj.price = getNumber(formobj.price, 2)" @input="computeGSS" v-model="formobj.price" clearable placeholder="" /></el-form-item>
+              <el-form-item prop="price"><span class="addinputInfo">{{ calculatePrice }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>考核工时</div>
               <el-form-item prop="examineHourPrice"><el-input class="addinputInfo addinputw" @keyup.native="formobj.examineHourPrice = getNumber(formobj.examineHourPrice, 2)" v-model="formobj.examineHourPrice" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty"><span class="icon">*</span>成本</div>
-              <el-form-item prop="cost"><el-input class="addinputInfo addinputw" @keyup.native="formobj.cost = getNumber(formobj.cost, 2)" v-model="formobj.cost" clearable placeholder="" /></el-form-item>
+              <div class="span-sty">备注</div>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.remarks" clearable placeholder="" /></el-form-item>
             </el-col>
           </el-row>
           <el-row>
@@ -98,6 +102,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
+              <div class="span-sty"><span class="icon">*</span>排序</div>
+              <el-form-item prop="sortNo"><el-input class="addinputInfo addinputw" @keyup.native="formobj.sortNo = getNumber(formobj.sortNo, 0)" v-model="formobj.sortNo" clearable placeholder="" /></el-form-item>
             </el-col>
           </el-row>
         </el-form>
@@ -108,7 +114,7 @@
 
 <script>
 import req from '@/api/basicinformation/maintenanceitem'
-import { getServiceType, getOrgSidByPath } from '@/api/Common/dictcommons'
+import { getServiceType, getOrgSidByPath, selSubjectInfo } from '@/api/Common/dictcommons'
 
 export default {
   name: 'MaintenanceItemAdd',
@@ -122,6 +128,7 @@ export default {
       serviceType_list: [],
       goodsModel_list: [],
       manufacturer_list: [],
+      subject_list: [],
       formobj: {
         sid: '',
         createBySid: '',
@@ -143,7 +150,9 @@ export default {
         sortNo: '',
         remarks: '',
         useOrgSid: '',
-        createOrgSid: ''
+        createOrgSid: '',
+        subjectName: '',
+        subjectSid: ''
       },
       rules: {
         sitemName: [{ required: true, message: '项目名称不能为空', trigger: 'blur' }],
@@ -153,11 +162,20 @@ export default {
         hours: [{ required: true, message: '工时数不能为空', trigger: 'blur' }],
         price: [{ required: true, message: '销售价不能为空', trigger: 'blur' }],
         examineHourPrice: [{ required: true, message: '考核工时不能为空', trigger: 'blur' }],
-        cost: [{ required: true, message: '成本不能为空', trigger: 'blur' }],
-        isReserve: [{ required: true, message: '预约项目不能为空', trigger: 'change' }]
+        cost: [{ required: true, message: '外协成本不能为空', trigger: 'blur' }],
+        isReserve: [{ required: true, message: '预约项目不能为空', trigger: 'change' }],
+        subjectName: [{ required: true, message: '科目不能为空', trigger: 'change' }]
       }
     }
   },
+  computed: {
+    // 计算销售价 = 工时单价 * 工时数 + 外协成本
+    calculatePrice() {
+      let price = '0'
+      price = Math.round((parseFloat(price) + (parseFloat(this.formobj.hourPrice !== '' ? this.formobj.hourPrice : '0') * parseFloat(this.formobj.hours !== '' ? this.formobj.hours : '0')) + parseFloat(this.formobj.cost !== '' ? this.formobj.cost : '0')) * 100) / 100
+      return price
+    }
+  },
   methods: {
     init() {
       getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
@@ -180,6 +198,11 @@ export default {
           this.manufacturer_list = res.data
         }
       })
+      selSubjectInfo({ useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) }).then((resp) => {
+        if (resp.success) {
+          this.subject_list = resp.data
+        }
+      })
     },
     showAdd() {
       this.viewTitle = '【新增】维修项目'
@@ -222,6 +245,14 @@ export default {
       }
       return val
     },
+    subjectChange(value) {
+      const choose = this.subject_list.filter((item) => item.subjectName === value)
+      if (choose.length > 0 && choose !== null) {
+        this.formobj.subjectSid = choose[0].subjectSid
+      } else {
+        this.formobj.subjectSid = ''
+      }
+    },
     serviceTypeChange(value) {
       const choose = this.serviceType_list.filter((item) => item.serviceType === value)
       if (choose !== null && choose.length > 0) {
@@ -246,15 +277,8 @@ export default {
         this.formobj.manufacturerSid = ''
       }
     },
-    // 计算销售价=工时数*工时单价
-    computeXSJ() {
-      this.formobj.price = Math.round((parseFloat(this.formobj.hourPrice === '' ? '0' : this.formobj.hourPrice) * parseFloat(this.formobj.hours === '' ? '0' : this.formobj.hours)) * 100) / 100
-    },
-    // 计算工时数=销售价除以工时单价
-    computeGSS() {
-      this.formobj.hours = Math.round((parseFloat(this.formobj.price === '' ? '0' : this.formobj.price) / parseFloat(this.formobj.hourPrice === '' ? '0' : this.formobj.hourPrice)) * 100) / 100
-    },
     saveOrUpdate() {
+      this.formobj.price = this.calculatePrice
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true
@@ -294,7 +318,9 @@ export default {
         sortNo: '',
         remarks: '',
         useOrgSid: '',
-        createOrgSid: ''
+        createOrgSid: '',
+        subjectName: '',
+        subjectSid: ''
       }
       this.submitdisabled = false
       this.$emit('doback')
diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue
index 71f2f8fd53..faebb37cf9 100644
--- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue
+++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue
@@ -24,6 +24,10 @@
             </el-col>
           </el-row>
           <el-row>
+            <el-col :span="8">
+              <div class="span-sty">科目</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.subjectName }}</span></el-form-item>
+            </el-col>
             <el-col :span="8" class="tlineheightb">
               <div class="span-sty">车型</div>
               <el-form-item><span class="addinputInfo">{{ formobj.goodsModel }}</span></el-form-item>
@@ -32,16 +36,8 @@
               <div class="span-sty">厂家</div>
               <el-form-item><span class="addinputInfo">{{ formobj.manufacturer }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
-              <div class="span-sty">备注</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
-            </el-col>
           </el-row>
           <el-row>
-            <el-col :span="8">
-              <div class="span-sty">排序</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.sortNo }}</span></el-form-item>
-            </el-col>
             <el-col :span="8">
               <div class="span-sty">工时单价</div>
               <el-form-item><span class="addinputInfo">{{ formobj.hourPrice }}</span></el-form-item>
@@ -50,6 +46,10 @@
               <div class="span-sty">工时数</div>
               <el-form-item><span class="addinputInfo">{{ formobj.hours }}</span></el-form-item>
             </el-col>
+            <el-col :span="8">
+              <div class="span-sty">外协成本</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.cost }}</span></el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="8">
@@ -61,8 +61,8 @@
               <el-form-item><span class="addinputInfo">{{ formobj.examineHourPrice }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty">成本</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.cost }}</span></el-form-item>
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>
@@ -75,6 +75,8 @@
               <el-form-item><span class="addinputInfo">{{ formobj.isClean == '1' ? '是' : '否' }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
+              <div class="span-sty">排序</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.sortNo }}</span></el-form-item>
             </el-col>
           </el-row>
         </el-form>
@@ -113,7 +115,9 @@ export default {
         sortNo: '',
         remarks: '',
         useOrgSid: '',
-        createOrgSid: ''
+        createOrgSid: '',
+        subjectName: '',
+        subjectSid: ''
       },
       rules: {}
     }
@@ -152,7 +156,9 @@ export default {
         sortNo: '',
         remarks: '',
         useOrgSid: '',
-        createOrgSid: ''
+        createOrgSid: '',
+        subjectName: '',
+        subjectSid: ''
       }
       this.$emit('doback')
     }
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBill.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBill.java
index 1befdf5239..ee534c3998 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBill.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBill.java
@@ -62,6 +62,16 @@ public class PmsPurchaseBill extends BaseEntity {
     private String sourceBillNo;
 	@ApiModelProperty("单据编号")
     private String billNo;
+
+    @ApiModelProperty("经营品牌Key")
+    private String operateBrandKey;
+    @ApiModelProperty("经营品牌Value")
+    private String operateBrandValue;
+    @ApiModelProperty("仓库类型Key")
+    private String warehouseTypeKey;
+    @ApiModelProperty("仓库类型Value")
+    private String warehouseTypeValue;
+
 	@ApiModelProperty("采购类型Key")
     private String purchaseTypeKey;
 	@ApiModelProperty("采购类型Value（厂家采购、外采、其他）")
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java
index cf8a310d90..9efe924f4d 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java
@@ -82,6 +82,16 @@ public class PmsPurchaseBillDetailsVo implements Vo {
     private String sourceBillNo;
 	@ApiModelProperty("单据编号")
     private String billNo;
+
+    @ApiModelProperty("经营品牌Key")
+    private String operateBrandKey;
+    @ApiModelProperty("经营品牌Value")
+    private String operateBrandValue;
+    @ApiModelProperty("仓库类型Key")
+    private String warehouseTypeKey;
+    @ApiModelProperty("仓库类型Value")
+    private String warehouseTypeValue;
+
 	@ApiModelProperty("采购类型Key")
     private String purchaseTypeKey;
 	@ApiModelProperty("采购类型Value（厂家采购、外采、其他）")
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java
index ad82d28c82..758bd012f8 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java
@@ -72,6 +72,16 @@ public class PmsPurchaseBillDto implements Dto {
     private String sourceBillNo;
 	@ApiModelProperty("单据编号")
     private String billNo;
+
+    @ApiModelProperty("经营品牌Key")
+    private String operateBrandKey;
+    @ApiModelProperty("经营品牌Value")
+    private String operateBrandValue;
+    @ApiModelProperty("仓库类型Key")
+    private String warehouseTypeKey;
+    @ApiModelProperty("仓库类型Value")
+    private String warehouseTypeValue;
+
 	@ApiModelProperty("采购类型Key")
     private String purchaseTypeKey;
 	@ApiModelProperty("采购类型Value（厂家采购、外采、其他）")