采购申请bug修改

src/views/modules/materialManagement/info/UpdateInfoForm.vue

@@ -210,12 +210,12 @@
           </vxe-table>
         </el-row>-->
 
-        <!-- 附件 -->
-        <UpLoadComponent ref="uploadComponent"></UpLoadComponent>
-        <MaterialManagementDialog ref="materialManagementDialog" @getUpload="getUpload"></MaterialManagementDialog>
-        <CwProgramPageForm ref="cwProgramPageForm" @getProgram="getProgram"></CwProgramPageForm>
-        <MaterialTypePullForm ref="materialTypePullForm" @getProgramForType="getProgramForType"></MaterialTypePullForm>
       </el-form>
+      <!-- 附件 -->
+      <UpLoadComponent ref="uploadComponent"></UpLoadComponent>
+      <MaterialManagementDialog ref="materialManagementDialog" @getUpload="getUpload"></MaterialManagementDialog>
+      <CwProgramPageForm ref="cwProgramPageForm" @getProgram="getProgram"></CwProgramPageForm>
+      <MaterialTypePullForm ref="materialTypePullForm" @getProgramForType="getProgramForType"></MaterialTypePullForm>
       <span slot="footer" class="dialog-footer">
       <el-button size="small" @click="close()" icon="el-icon-circle-close">关闭</el-button>
       <el-button size="small" type="primary" v-if="method != 'view'" @click="doSubmit()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>

src/views/modules/materialManagement/purchase/PurchaseForm.vue

@@ -202,14 +202,15 @@
         </vxe-table>
       </el-row>-->
 
-      <!-- 附件 -->
-      <MaterialManagementDialog ref="materialManagementDialog" @getUpload="getUpload"></MaterialManagementDialog>
-      <UpLoadComponent ref="uploadComponent"></UpLoadComponent>
-      <CwProgramPageForm ref="cwProgramPageForm" @getProgram="getProgram"></CwProgramPageForm>
-      <MaterialTypePullForm ref="materialTypePullForm" @getProgramForType="getProgramForType"></MaterialTypePullForm>
-<!--      <CwReimbursementTypePullForm ref="cwReimbursementTypePullForm" @getProgramForType="getProgramForType"></CwReimbursementTypePullForm>-->
-      <UserPullForm ref="userPullForm" @getProgramForUser="getProgramForUser"></UserPullForm>
+
     </el-form>
+    <!-- 附件 -->
+    <MaterialManagementDialog ref="materialManagementDialog" @getUpload="getUpload"></MaterialManagementDialog>
+    <UpLoadComponent ref="uploadComponent"></UpLoadComponent>
+    <CwProgramPageForm ref="cwProgramPageForm" @getProgram="getProgram"></CwProgramPageForm>
+    <MaterialTypePullForm ref="materialTypePullForm" @getProgramForType="getProgramForType"></MaterialTypePullForm>
+    <!--      <CwReimbursementTypePullForm ref="cwReimbursementTypePullForm" @getProgramForType="getProgramForType"></CwReimbursementTypePullForm>-->
+    <UserPullForm ref="userPullForm" @getProgramForUser="getProgramForUser"></UserPullForm>
   </div>
 </template>
 
@@ -470,6 +471,7 @@
         }
         this.inputForm.files = this.$refs.uploadComponent.getDataList()
         this.inputForm.status = '1'
+        console.log('this.inputForm.tradeTotalPrice', this.inputForm.tradeTotalPrice)
         this.materialManagementService.save(this.inputForm).then(({data}) => {
           callback()
           this.$refs.inputForm.resetFields()

src/views/modules/materialManagement/purchase/PurchaseList.vue

@@ -46,16 +46,30 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="采购类别" prop="procurementType">
-        <el-select v-model="searchForm.procurementType" placeholder="请选择" style="width:100%;">
-          <el-option
-            v-for="item in $dictUtils.getDictList('filed_type')"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
+      <el-form-item label="报销类别" prop="procurementType">
+        <SelectTree
+          ref="areaTree"
+          :props="{
+                  value: 'id',             // ID字段名
+                  label: 'name',         // 显示名称
+                  children: 'children'    // 子级字段名
+                }"
+          url="/reimbursementApproval/type/treeData2?type=12"
+          :value="searchForm.procurementType"
+          :clearable="true"
+          :accordion="true"
+          @getValue="(value, label) => {searchForm.procurementType=label}"/>
       </el-form-item>
+<!--      <el-form-item label="采购类别" prop="procurementType">-->
+<!--        <el-select v-model="searchForm.procurementType" placeholder="请选择" style="width:100%;">-->
+<!--          <el-option-->
+<!--            v-for="item in $dictUtils.getDictList('filed_type')"-->
+<!--            :key="item.value"-->
+<!--            :label="item.label"-->
+<!--            :value="item.value">-->
+<!--          </el-option>-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item label="合同金额" prop="contractAmounts">
         <InputNumber :disabled="false" :precision="num" v-model="searchForm.contractAmounts"></InputNumber>
       </el-form-item>