往来账款9月22日需求优化

front-vue/src/views/service/bill/addBill.vue

@@ -74,39 +74,6 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="贸易日期" prop="zbiDate">
-            <el-date-picker
-              style="width: 300px"
-              v-model="form.zbiDate"
-              clearable
-              value-format="yyyy-MM-dd"
-              type="date"
-              placeholder="选择日期"
-              :picker-options="pickerOptionsStart"
-            >
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item
-            :label="
-              type == '00'
-                ? '预计付款日期'
-                : type == '01'
-                ? '预计收款日期'
-                : '预计收/付款日期'
-            "
-            prop="zbiPayDate"
-          >
-            <el-date-picker
-              style="width: 300px"
-              v-model="form.zbiPayDate"
-              clearable
-              value-format="yyyy-MM-dd"
-              type="date"
-              placeholder="选择日期"
-              :picker-options="pickerOptionsEnd"
-            >
-            </el-date-picker>
-          </el-form-item>
           <el-form-item label="应收方" prop="zbiPayeeId">
             <el-select
               style="width: 300px"
@@ -144,7 +111,40 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="金额">
+          <el-form-item label="贸易日期" prop="zbiDate">
+            <el-date-picker
+              style="width: 300px"
+              v-model="form.zbiDate"
+              clearable
+              value-format="yyyy-MM-dd"
+              type="date"
+              placeholder="选择日期"
+              :picker-options="pickerOptionsStart"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item
+            :label="
+              type == '00'
+                ? '预计付款日期'
+                : type == '01'
+                ? '预计收款日期'
+                : '预计收/付款日期'
+            "
+            prop="zbiPayDate"
+          >
+            <el-date-picker
+              style="width: 300px"
+              v-model="form.zbiPayDate"
+              clearable
+              value-format="yyyy-MM-dd"
+              type="date"
+              placeholder="选择日期"
+              :picker-options="pickerOptionsEnd"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="账款金额">
             <el-input
               :disabled="true"
               :value="allAmount()"
@@ -154,7 +154,7 @@
               <template slot="append">元</template>
             </el-input>
           </el-form-item>
-          <el-form-item label="金额大写">
+          <el-form-item label="账款金额大写">
             <el-input
               :disabled="true"
               :value="smallToBig(allAmount())"
@@ -162,38 +162,38 @@
             >
             </el-input>
           </el-form-item>
-          <el-form-item label="合同编号" prop="zbiContractNo">
+          <el-form-item label="贸易合同编号" prop="zbiContractNo">
             <el-input
               v-model="form.zbiContractNo"
               clearable
-              placeholder="请输入合同编号"
+              placeholder="请输入贸易合同编号"
               maxlength="20"
               style="width: 300px"
             />
           </el-form-item>
-          <el-form-item label="账款服务">
+          <el-form-item label="贸易商品/服务">
             <el-input
               v-model="form.zbiService"
               clearable
-              placeholder="请输入账款服务"
+              placeholder="请输入贸易商品/服务"
               maxlength="20"
               style="width: 300px"
             />
           </el-form-item>
-          <el-form-item label="配送订单">
+          <el-form-item label="配送企业">
             <el-input
-              v-model="form.zbiOrderNo"
+              v-model="form.zbiDistributor"
               clearable
-              placeholder="请输入配送订单"
+              placeholder="请输入配送企业"
               maxlength="20"
               style="width: 300px"
             />
           </el-form-item>
-          <el-form-item label="配送企业">
+          <el-form-item label="配送订单号">
             <el-input
-              v-model="form.zbiDistributor"
+              v-model="form.zbiOrderNo"
               clearable
-              placeholder="请输入配送企业"
+              placeholder="请输入配送订单号"
               maxlength="20"
               style="width: 300px"
             />

front-vue/src/views/service/bill/billAdd.vue

@@ -74,39 +74,6 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="贸易日期" prop="zbiDate">
-            <el-date-picker
-              style="width: 300px"
-              v-model="form.zbiDate"
-              clearable
-              value-format="yyyy-MM-dd"
-              type="date"
-              placeholder="选择日期"
-              :picker-options="pickerOptionsStart"
-            >
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item
-            :label="
-              type == '00'
-                ? '预计付款日期'
-                : type == '01'
-                ? '预计收款日期'
-                : '预计收/付款日期'
-            "
-            prop="zbiPayDate"
-          >
-            <el-date-picker
-              style="width: 300px"
-              v-model="form.zbiPayDate"
-              clearable
-              value-format="yyyy-MM-dd"
-              type="date"
-              placeholder="选择日期"
-              :picker-options="pickerOptionsEnd"
-            >
-            </el-date-picker>
-          </el-form-item>
           <el-form-item label="应收方" prop="zbiPayeeId">
             <el-select
               style="width: 300px"
@@ -144,7 +111,40 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="金额">
+          <el-form-item label="贸易日期" prop="zbiDate">
+            <el-date-picker
+              style="width: 300px"
+              v-model="form.zbiDate"
+              clearable
+              value-format="yyyy-MM-dd"
+              type="date"
+              placeholder="选择日期"
+              :picker-options="pickerOptionsStart"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item
+            :label="
+              type == '00'
+                ? '预计付款日期'
+                : type == '01'
+                ? '预计收款日期'
+                : '预计收/付款日期'
+            "
+            prop="zbiPayDate"
+          >
+            <el-date-picker
+              style="width: 300px"
+              v-model="form.zbiPayDate"
+              clearable
+              value-format="yyyy-MM-dd"
+              type="date"
+              placeholder="选择日期"
+              :picker-options="pickerOptionsEnd"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="账款金额">
             <el-input
               :disabled="true"
               :value="allAmount()"
@@ -154,7 +154,7 @@
               <template slot="append">元</template>
             </el-input>
           </el-form-item>
-          <el-form-item label="金额大写">
+          <el-form-item label="账款金额大写">
             <el-input
               :disabled="true"
               :value="smallToBig(allAmount())"
@@ -162,38 +162,38 @@
             >
             </el-input>
           </el-form-item>
-          <el-form-item label="合同编号" prop="zbiContractNo">
+          <el-form-item label="贸易合同编号" prop="zbiContractNo">
             <el-input
               v-model="form.zbiContractNo"
               clearable
-              placeholder="请输入合同编号"
+              placeholder="请输入贸易合同编号"
               maxlength="20"
               style="width: 300px"
             />
           </el-form-item>
-          <el-form-item label="账款服务">
+          <el-form-item label="贸易商品/服务">
             <el-input
               v-model="form.zbiService"
               clearable
-              placeholder="请输入账款服务"
+              placeholder="请输入贸易商品/服务"
               maxlength="20"
               style="width: 300px"
             />
           </el-form-item>
-          <el-form-item label="配送订单">
+          <el-form-item label="配送企业">
             <el-input
-              v-model="form.zbiOrderNo"
+              v-model="form.zbiDistributor"
               clearable
-              placeholder="请输入配送订单"
+              placeholder="请输入配送企业"
               maxlength="20"
               style="width: 300px"
             />
           </el-form-item>
-          <el-form-item label="配送企业">
+          <el-form-item label="配送订单号">
             <el-input
-              v-model="form.zbiDistributor"
+              v-model="form.zbiOrderNo"
               clearable
-              placeholder="请输入配送企业"
+              placeholder="请输入配送订单号"
               maxlength="20"
               style="width: 300px"
             />

front-vue/src/views/service/bill/billDetail.vue

@@ -52,6 +52,13 @@
               style="width: 300px"
             />
           </el-form-item>
+          <el-form-item label="应收方" prop="zbiPayeeId">
+            <el-input
+              v-model="form.payeeName"
+              maxlength="20"
+              style="width: 300px"
+            />
+          </el-form-item>
           <el-form-item label="贸易日期" prop="zbiDate">
             <el-date-picker
               style="width: 300px"
@@ -79,14 +86,7 @@
             >
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="应收方" prop="zbiPayeeId">
-            <el-input
-              v-model="form.payeeName"
-              maxlength="20"
-              style="width: 300px"
-            />
-          </el-form-item>
-          <el-form-item label="金额" prop="zbiAmount">
+          <el-form-item label="账款金额" prop="zbiAmount">
             <el-input
               v-model="form.zbiAmount"
               maxlength="20"
@@ -95,7 +95,7 @@
               <template slot="append">元</template>
             </el-input>
           </el-form-item>
-          <el-form-item label="金额大写">
+          <el-form-item label="账款金额大写">
             <el-input
               :disabled="true"
               :value="smallToBig(form.zbiAmount)"
@@ -103,30 +103,30 @@
             >
             </el-input>
           </el-form-item>
-          <el-form-item label="合同编号" prop="zbiContractNo">
+          <el-form-item label="贸易合同编号" prop="zbiContractNo">
             <el-input
               v-model="form.zbiContractNo"
               maxlength="20"
               style="width: 300px"
             />
           </el-form-item>
-          <el-form-item label="账款服务">
+          <el-form-item label="贸易商品/服务">
             <el-input
               v-model="form.zbiService"
               maxlength="20"
               style="width: 300px"
             />
           </el-form-item>
-          <el-form-item label="配送订单">
+          <el-form-item label="配送企业">
             <el-input
-              v-model="form.zbiOrderNo"
+              v-model="form.zbiDistributor"
               maxlength="20"
               style="width: 300px"
             />
           </el-form-item>
-          <el-form-item label="配送企业">
+          <el-form-item label="配送订单号">
             <el-input
-              v-model="form.zbiDistributor"
+              v-model="form.zbiOrderNo"
               maxlength="20"
               style="width: 300px"
             />

front-vue/src/views/service/bill/billEdit.vue

@@ -100,39 +100,6 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="贸易日期" prop="zbiDate">
-            <el-date-picker
-              style="width: 300px"
-              v-model="form.zbiDate"
-              clearable
-              value-format="yyyy-MM-dd"
-              type="date"
-              placeholder="选择日期"
-              :picker-options="pickerOptionsStart"
-            >
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item
-            :label="
-              type == '00'
-                ? '预计付款日期'
-                : type == '01'
-                ? '预计收款日期'
-                : '预计收/付款日期'
-            "
-            prop="zbiPayDate"
-          >
-            <el-date-picker
-              style="width: 300px"
-              v-model="form.zbiPayDate"
-              clearable
-              value-format="yyyy-MM-dd"
-              type="date"
-              placeholder="选择日期"
-              :picker-options="pickerOptionsEnd"
-            >
-            </el-date-picker>
-          </el-form-item>
           <el-form-item label="应收方" prop="zbiPayeeId">
             <el-input
               v-model="form.payeeName"
@@ -186,7 +153,40 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="金额">
+          <el-form-item label="贸易日期" prop="zbiDate">
+            <el-date-picker
+              style="width: 300px"
+              v-model="form.zbiDate"
+              clearable
+              value-format="yyyy-MM-dd"
+              type="date"
+              placeholder="选择日期"
+              :picker-options="pickerOptionsStart"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item
+            :label="
+              type == '00'
+                ? '预计付款日期'
+                : type == '01'
+                ? '预计收款日期'
+                : '预计收/付款日期'
+            "
+            prop="zbiPayDate"
+          >
+            <el-date-picker
+              style="width: 300px"
+              v-model="form.zbiPayDate"
+              clearable
+              value-format="yyyy-MM-dd"
+              type="date"
+              placeholder="选择日期"
+              :picker-options="pickerOptionsEnd"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="账款金额">
             <el-input
               :disabled="true"
               :value="allAmount()"
@@ -196,7 +196,7 @@
               <template slot="append">元</template>
             </el-input>
           </el-form-item>
-          <el-form-item label="金额大写">
+          <el-form-item label="账款金额大写">
             <el-input
               :disabled="true"
               :value="smallToBig(allAmount())"
@@ -204,38 +204,38 @@
             >
             </el-input>
           </el-form-item>
-          <el-form-item label="合同编号" prop="zbiContractNo">
+          <el-form-item label="贸易合同编号" prop="zbiContractNo">
             <el-input
               v-model="form.zbiContractNo"
               clearable
-              placeholder="请输入合同编号"
+              placeholder="请输入贸易合同编号"
               maxlength="20"
               style="width: 300px"
             />
           </el-form-item>
-          <el-form-item label="账款服务">
+          <el-form-item label="贸易商品/服务">
             <el-input
               v-model="form.zbiService"
               clearable
-              placeholder="请输入账款服务"
+              placeholder="请输入贸易商品/服务"
               maxlength="20"
               style="width: 300px"
             />
           </el-form-item>
-          <el-form-item label="配送订单">
+          <el-form-item label="配送企业">
             <el-input
-              v-model="form.zbiOrderNo"
+              v-model="form.zbiDistributor"
               clearable
-              placeholder="请输入配送订单"
+              placeholder="请输入配送企业"
               maxlength="20"
               style="width: 300px"
             />
           </el-form-item>
-          <el-form-item label="配送企业">
+          <el-form-item label="配送订单号">
             <el-input
-              v-model="form.zbiDistributor"
+              v-model="form.zbiOrderNo"
               clearable
-              placeholder="请输入配送企业"
+              placeholder="请输入配送订单号"
               maxlength="20"
               style="width: 300px"
             />