Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

lms/nladmin-ui/src/views/wms/st/incharge/index.vue

@@ -79,6 +79,7 @@
             >
               <el-option
                 v-for="item in dict.ST_INV_IN_TYPE"
+                :disabled="item.value !== '0002'"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"

lms/nladmin-ui/src/views/wms/st/outbill/MoneyDialog.vue

@@ -114,6 +114,24 @@
         </el-col>
       </el-row>
 
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="运转费:">
+            <el-input v-model="formMst.run_freight" size="mini" style="width: 210px" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="卸车费:">
+            <el-input v-model="formMst.unload_freight" size="mini" style="width: 210px" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="其他费用:">
+            <el-input v-model="formMst.other_freight" size="mini" style="width: 210px" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
       <el-row :gutter="20">
         <el-col :span="20" style="border: 1px solid white">
           <span />

lms/nladmin-ui/src/views/wms/st/outcharge/index.vue

@@ -78,6 +78,7 @@
             >
               <el-option
                 v-for="item in dict.ST_INV_OUT_TYPE"
+                :disabled="item.value !== '1001' && item.value !== '1009'"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"