zhangyuewww %!s(int64=2) %!d(string=hai) anos
pai
achega
09a28aee91

+ 7 - 0
src/views/outboundManagement/weighingManagementNew.vue

@@ -1005,6 +1005,13 @@
           return
         }
         if (this.tpyeNo == 1) {
+          if (!this.weighingList.inOutType) {
+            this.$message({
+              message: '出库类型不能为空',
+              type: 'warning',
+            })
+            return
+          }
           if (!this.weighingList.tare) {
             this.$message({
               message: '皮重不能为空',

+ 10 - 17
src/views/profitable/expenseallot.vue

@@ -13,23 +13,16 @@
      
       <div>
         <el-form label-position="left">
-          <div style='margin:10px auto; '>基本信息</div>
-          <el-form-item  label-width='100px' label="用途" span="1" prop="purpose" class="readonly">
-            <ws-select disabled v-model="deptBudgetList.expensesPurpose" placeholder="" class="typeselect" >
-              <ws-option label="合同费用" value="1"
-                style="color: #8890b1" />
-                <ws-option label="库点费用" value="3"
-                style="color: #8890b1" />
-                <ws-option label="经营性费用" value="5"
-                style="color: #8890b1" />
-            </ws-select>
+          <div style='margin:0 -30px 10px;font-weight:bold'>基本信息</div>
+         <el-form-item label-width='100px' label="用途" span="1" prop="expensesPurpose">
+              <span v-if='deptBudgetList.expensesPurpose==1'>合同费用</span>
+              <span v-if='deptBudgetList.expensesPurpose==3'>库点费用</span>
+              <span v-if='deptBudgetList.expensesPurpose==5'>经营性费用</span>
           </el-form-item>
-          <el-form-item label-width='100px' v-if='deptBudgetList.expensesPurpose==1' label="类型" span="1" prop="contractNo" class="readonly">
-            <ws-select disabled v-model="deptBudgetList.costType" placeholder="" class="typeselect" >
-                <ws-option label="粮款" value="1" style="color: #8890b1" />
-                <ws-option label="非粮款" value="3" style="color: #8890b1" />
-                <ws-option label="保证金" value="5" style="color: #8890b1" />
-            </ws-select>
+          <el-form-item label-width='100px' v-if='deptBudgetList.expensesPurpose==1' label="类型" span="1" prop="costType">
+              <span v-if='deptBudgetList.costType==1'>粮款</span>
+              <span v-if='deptBudgetList.costType==3'>非粮款</span>
+              <span v-if='deptBudgetList.costType==5'>保证金</span>
           </el-form-item>
           <el-form-item v-if='deptBudgetList.expensesPurpose==3' label-width='100px' label="仓库名称" span="1" prop="warehouse" class="readonly">
           {{deptBudgetList.warehouseName}}
@@ -62,7 +55,7 @@
           </div>
         </el-form-item>
         </el-form>
-        <div style='margin:10px auto;width:90%;'>费用分配</div>
+        <div style='margin:0 50px 10px;font-weight:bold'>费用分配</div>
         <div style='margin:10px auto;width:90%;'>
             <ws-select v-model="mode" placeholder="费用分配方式" class="typeselect" @change="modeselect">
           <ws-option v-for="item in modeList" :key="item.value" :label="item.value" :value="item.value"

+ 1 - 1
src/views/profitable/expensemanagentlook.vue

@@ -18,7 +18,7 @@
               <span v-if='deptBudgetList.expensesPurpose==3'>库点费用</span>
               <span v-if='deptBudgetList.expensesPurpose==5'>经营性费用</span>
           </el-form-item>
-          <el-form-item label-width='100px' label="类型" span="1" prop="costType">
+          <el-form-item label-width='100px' v-if='deptBudgetList.expensesPurpose==1' label="类型" span="1" prop="costType">
               <span v-if='deptBudgetList.costType==1'>粮款</span>
               <span v-if='deptBudgetList.costType==3'>非粮款</span>
               <span v-if='deptBudgetList.costType==5'>保证金</span>