Merge branch 'mtp_v6' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB into mtp_v6

src/views/business/purchase/components/settlement/index.vue

@@ -1,233 +1,222 @@
 <template>
-    <!-- 交收登记-->
-    <a-modal class="commonModal paddingDialog settlement" :title="selectedRow.contracttype === 1 ? '采购合同-交收登记' : '销售合同-交收登记'" v-model:visible="visible" centered @cancel="cancel" width="890px">
-        <template #footer>
-            <a-button key="submit" class="cancelBtn" @click="cancel">取消 </a-button>
-            <a-button key="submit" type="primary" :loading="loading" @click="submit">交收登记 </a-button>
-        </template>
-        <fieldset class="formFieldSet">
-            <legend>合同基本信息</legend>
-            <a-form class="inlineForm">
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="合同编号">
-                            <span class="white">{{ formatValue(selectedRow.contractno) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="定价类型">
-                            <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</span>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item :label="selectedRow.contracttype === 1 ? '采购方' : '销售方'">
-                            <span class="white">{{ formatValue(selectedRow.accountname) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="现货品种">
-                            <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="合同签署量">
-                            <span class="white">{{ formatValue(selectedRow.qty + selectedRow.enumdicname) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="商品价格">
-                            <span class="white">{{ formatValue(selectedRow.price) }}</span>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-            </a-form>
-        </fieldset>
-        <fieldset class="formFieldSet">
-            <legend>已登记信息</legend>
-            <a-form class="inlineForm">
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="已定价量">
-                            <span class="white">{{ selectedRow.pricedqty + ' ' + selectedRow.enumdicname }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="已交收量">
-                            <span class="white">{{ selectedRow.reckonrealqty + ' ' + selectedRow.enumdicname }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="调整金额">
-                            <span class="white">{{ selectedRow.reckonadjustamount + ' 元' }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="保证金">
-                            <span class="white">{{ selectedRow.margin + ' 元' }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="24">
-                        <a-form-item label="其他费用">
-                            <span class="white">{{ selectedRow.reckonotheramount + ' 元' }}</span>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-            </a-form>
-        </fieldset>
-        <fieldset class="formFieldSet">
-            <legend>本次交收信息</legend>
-            <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
-                <a-checkbox-group class="commonCheckboxGroup">
-                    <a-row>
-                        <a-col :span="12">
-                            <a-form-item class="relative">
-                                <template #label>
-                                    <a-checkbox value="交收量" v-model:checked="checkedObj.qty" @change="() => (checkedObj.qty = !checkedObj.qty)">交收量</a-checkbox>
-                                </template>
-                                <a-form-item class="relative" v-if="checkedObj.qty" name="ReckonRealQty">
-                                    <a-input-number v-model:value="formState.ReckonRealQty" class="dialogInput" style="width: 200px" :min="0" :max="selectedRow.unsureqty" placeholder="请输入交收量" suffix="单位" />
-                                    <div class="tip mt10">
-                                        <span>待交收量：{{ selectedRow.unsureqty }}{{ selectedRow.enumdicname }}</span
-                                        ><a class="blue fr" @click="formState.ReckonRealQty = selectedRow.unsureqty">全部登记</a>
-                                    </div>
-                                </a-form-item>
-                                <a-form-item class="relative" v-else>
-                                    <a-input-number disabled class="dialogInput" style="width: 200px" :min="0" placeholder="请输入交收量" suffix="单位" />
-                                    <div class="tip mt10"
-                                        ><span class="fl">未定价量：--{{ selectedRow.enumdicname }}</span
-                                        ><a class="blue fr">全部登记</a>
-                                    </div>
-                                </a-form-item>
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="12">
-                            <a-form-item class="relative">
-                                <template #label>
-                                    <a-checkbox value="其他费用" v-model:checked="checkedObj.amount" @change="() => (checkedObj.amount = !checkedObj.amount)">其他费用</a-checkbox>
-                                </template>
-                                <a-form-item v-if="checkedObj.amount" name="ReckonOtherAmount">
-                                    <a-input-number v-model:value="formState.ReckonOtherAmount" class="dialogInput" style="width: 200px" :min="0" placeholder="请输入其他费用" suffix="元" />
-                                </a-form-item>
-                                <a-form-item v-else>
-                                    <a-input-number readonly class="dialogInput" style="width: 200px" :min="0" placeholder="请输入其他费用" suffix="元" />
-                                </a-form-item>
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="12" class="mt10">
-                            <a-form-item class="relative">
-                                <template #label>
-                                    <a-checkbox value="调整保证金" v-model:checked="checkedObj.margin" @change="() => (checkedObj.margin = !checkedObj.margin)">调整保证金 </a-checkbox>
-                                </template>
-                                <a-form-item class="relative" v-if="checkedObj.margin">
-                                    <a-radio-group class="commonRadioGroup" v-model:value="checkedObj.adjustMargin">
-                                        <a-row style="width: 200px">
-                                            <a-col :span="12">
-                                                <a-radio :value="1">追加</a-radio>
-                                            </a-col>
-                                            <a-col :span="12">
-                                                <a-radio :value="2">退还</a-radio>
-                                            </a-col>
-                                        </a-row>
-                                    </a-radio-group>
-                                    <div class="tip mt10">
-                                        <a-form-item name="AddMargin" v-if="checkedObj.adjustMargin === 1">
-                                            <a-input-number v-model:value="formState.AddMargin" class="dialogInput" style="width: 200px" :min="0" placeholder="请输入调整保证金" suffix="元" />
-                                        </a-form-item>
-                                        <a-form-item name="DecMargin" v-else>
-                                            <a-input-number v-model:value="formState.DecMargin" class="dialogInput" style="width: 200px" :min="0" placeholder="请输入调整保证金" suffix="元" />
-                                        </a-form-item>
-                                    </div>
-                                </a-form-item>
-                                <a-form-item class="relative" v-else>
-                                    <a-radio-group class="commonRadioGroup" disabled>
-                                        <a-row style="width: 200px">
-                                            <a-col :span="12">
-                                                <a-radio :value="1">追加</a-radio>
-                                            </a-col>
-                                            <a-col :span="12">
-                                                <a-radio :value="2">退还</a-radio>
-                                            </a-col>
-                                        </a-row>
-                                    </a-radio-group>
-                                    <div class="tip mt10">
-                                        <a-input-number disabled class="dialogInput" style="width: 200px" :min="0" placeholder="请输入调整保证金" suffix="元" />
-                                    </div>
-                                </a-form-item>
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="12" class="mt10">
-                            <a-form-item class="relative">
-                                <template #label>
-                                    <a-checkbox value="调整金额" v-model:checked="checkedObj.justAmount" @change="() => (checkedObj.justAmount = !checkedObj.justAmount)">调整金额 </a-checkbox>
-                                </template>
-                                <a-form-item class="relative" v-if="checkedObj.justAmount">
-                                    <a-radio-group class="commonRadioGroup" v-model:value="checkedObj.adjustAmount">
-                                        <a-row style="width: 200px">
-                                            <a-col :span="12">
-                                                <a-radio
-                                                    :value="1"
-                                                    @focus="
+  <!-- 交收登记-->
+  <a-modal class="commonModal paddingDialog settlement" :title="selectedRow.contracttype === 1 ? '采购合同-交收登记' : '销售合同-交收登记'" v-model:visible="visible" centered @cancel="cancel" width="890px">
+    <template #footer>
+      <a-button key="submit" class="cancelBtn" @click="cancel">取消 </a-button>
+      <a-button key="submit" type="primary" :loading="loading" @click="submit">交收登记 </a-button>
+    </template>
+    <fieldset class="formFieldSet">
+      <legend>合同基本信息</legend>
+      <a-form class="inlineForm">
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="合同编号">
+              <span class="white">{{ formatValue(selectedRow.contractno) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="定价类型">
+              <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item :label="selectedRow.contracttype === 1 ? '采购方' : '销售方'">
+              <span class="white">{{ formatValue(selectedRow.accountname) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="现货品种">
+              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="合同签署量">
+              <span class="white">{{ formatValue(selectedRow.qty + selectedRow.enumdicname) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="商品价格">
+              <span class="white">{{ handlePrice() }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </fieldset>
+    <fieldset class="formFieldSet">
+      <legend>已登记信息</legend>
+      <a-form class="inlineForm">
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="已定价量">
+              <span class="white">{{ selectedRow.pricedqty + ' ' + selectedRow.enumdicname }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="已交收量">
+              <span class="white">{{ selectedRow.reckonrealqty + ' ' + selectedRow.enumdicname }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="调整金额">
+              <span class="white">{{ selectedRow.reckonadjustamount + ' 元' }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="保证金">
+              <span class="white">{{ selectedRow.margin + ' 元' }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="其他费用">
+              <span class="white">{{ selectedRow.reckonotheramount + ' 元' }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </fieldset>
+    <fieldset class="formFieldSet">
+      <legend>本次交收信息</legend>
+      <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
+        <a-checkbox-group class="commonCheckboxGroup">
+          <a-row>
+            <a-col :span="12">
+              <a-form-item class="relative">
+                <template #label>
+                  <a-checkbox value="交收量" v-model:checked="checkedObj.qty" @change="() => (checkedObj.qty = !checkedObj.qty)">交收量</a-checkbox>
+                </template>
+                <a-form-item class="relative" v-if="checkedObj.qty" name="ReckonRealQty">
+                  <a-input-number v-model:value="formState.ReckonRealQty" class="dialogInput" style="width: 200px" :min="0" :max="selectedRow.unsureqty" placeholder="请输入交收量" suffix="单位" />
+                  <div class="tip mt10">
+                    <span>待交收量：{{ selectedRow.unsureqty }}{{ selectedRow.enumdicname }}</span><a class="blue fr" @click="formState.ReckonRealQty = selectedRow.unsureqty">全部登记</a>
+                  </div>
+                </a-form-item>
+                <a-form-item class="relative" v-else>
+                  <a-input-number disabled class="dialogInput" style="width: 200px" :min="0" placeholder="请输入交收量" suffix="单位" />
+                  <div class="tip mt10"><span class="fl">未定价量：--{{ selectedRow.enumdicname }}</span><a class="blue fr">全部登记</a>
+                  </div>
+                </a-form-item>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item class="relative">
+                <template #label>
+                  <a-checkbox value="其他费用" v-model:checked="checkedObj.amount" @change="() => (checkedObj.amount = !checkedObj.amount)">其他费用</a-checkbox>
+                </template>
+                <a-form-item v-if="checkedObj.amount" name="ReckonOtherAmount">
+                  <a-input-number v-model:value="formState.ReckonOtherAmount" class="dialogInput" style="width: 200px" :min="0" placeholder="请输入其他费用" suffix="元" />
+                </a-form-item>
+                <a-form-item v-else>
+                  <a-input-number readonly class="dialogInput" style="width: 200px" :min="0" placeholder="请输入其他费用" suffix="元" />
+                </a-form-item>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12" class="mt10">
+              <a-form-item class="relative">
+                <template #label>
+                  <a-checkbox value="调整保证金" v-model:checked="checkedObj.margin" @change="() => (checkedObj.margin = !checkedObj.margin)">调整保证金 </a-checkbox>
+                </template>
+                <a-form-item class="relative" v-if="checkedObj.margin">
+                  <a-radio-group class="commonRadioGroup" v-model:value="checkedObj.adjustMargin">
+                    <a-row style="width: 200px">
+                      <a-col :span="12">
+                        <a-radio :value="1">追加</a-radio>
+                      </a-col>
+                      <a-col :span="12">
+                        <a-radio :value="2">退还</a-radio>
+                      </a-col>
+                    </a-row>
+                  </a-radio-group>
+                  <div class="tip mt10">
+                    <a-form-item name="AddMargin" v-if="checkedObj.adjustMargin === 1">
+                      <a-input-number v-model:value="formState.AddMargin" class="dialogInput" style="width: 200px" :min="0" placeholder="请输入调整保证金" suffix="元" />
+                    </a-form-item>
+                    <a-form-item name="DecMargin" v-else>
+                      <a-input-number v-model:value="formState.DecMargin" class="dialogInput" style="width: 200px" :min="0" placeholder="请输入调整保证金" suffix="元" />
+                    </a-form-item>
+                  </div>
+                </a-form-item>
+                <a-form-item class="relative" v-else>
+                  <a-radio-group class="commonRadioGroup" disabled>
+                    <a-row style="width: 200px">
+                      <a-col :span="12">
+                        <a-radio :value="1">追加</a-radio>
+                      </a-col>
+                      <a-col :span="12">
+                        <a-radio :value="2">退还</a-radio>
+                      </a-col>
+                    </a-row>
+                  </a-radio-group>
+                  <div class="tip mt10">
+                    <a-input-number disabled class="dialogInput" style="width: 200px" :min="0" placeholder="请输入调整保证金" suffix="元" />
+                  </div>
+                </a-form-item>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12" class="mt10">
+              <a-form-item class="relative">
+                <template #label>
+                  <a-checkbox value="调整金额" v-model:checked="checkedObj.justAmount" @change="() => (checkedObj.justAmount = !checkedObj.justAmount)">调整金额 </a-checkbox>
+                </template>
+                <a-form-item class="relative" v-if="checkedObj.justAmount">
+                  <a-radio-group class="commonRadioGroup" v-model:value="checkedObj.adjustAmount">
+                    <a-row style="width: 200px">
+                      <a-col :span="12">
+                        <a-radio :value="1" @focus="
                                                         () => {
                                                             formState.ReckonAdjustAmount ? (formState.ReckonAdjustAmount = Math.abs(formState.ReckonAdjustAmount)) : 0;
                                                         }
-                                                    "
-                                                >
-                                                    增加</a-radio
-                                                >
-                                            </a-col>
-                                            <a-col :span="12">
-                                                <a-radio
-                                                    :value="2"
-                                                    @focus="
+                                                    ">
+                          增加</a-radio>
+                      </a-col>
+                      <a-col :span="12">
+                        <a-radio :value="2" @focus="
                                                         () => {
                                                             formState.ReckonAdjustAmount ? (formState.ReckonAdjustAmount = -1 * Math.abs(formState.ReckonAdjustAmount)) : 0;
                                                         }
-                                                    "
-                                                >
-                                                    减少</a-radio
-                                                >
-                                            </a-col>
-                                        </a-row>
-                                    </a-radio-group>
-                                    <div class="tip mt10">
-                                        <a-form-item name="ReckonAdjustAmount">
-                                            <a-input-number v-model:value="formState.ReckonAdjustAmount" @change="formState.ReckonAdjustAmount = Math.abs(formState.ReckonAdjustAmount)" class="dialogInput" style="width: 200px" :min="0" placeholder="请输入调整金额" suffix="元" v-if="checkedObj.adjustAmount === 1" />
-                                            <a-input-number v-model:value="formState.ReckonAdjustAmount" @change="formState.ReckonAdjustAmount = -1 * Math.abs(formState.ReckonAdjustAmount)" class="dialogInput" :min="0" style="width: 200px" placeholder="请输入调整金额" suffix="元" v-else />
-                                        </a-form-item>
-                                    </div>
-                                </a-form-item>
-                                <a-form-item class="relative" v-else>
-                                    <a-radio-group class="commonRadioGroup" disabled>
-                                        <a-row style="width: 200px">
-                                            <a-col :span="12">
-                                                <a-radio :value="1">增加</a-radio>
-                                            </a-col>
-                                            <a-col :span="12">
-                                                <a-radio :value="2">减少</a-radio>
-                                            </a-col>
-                                        </a-row>
-                                    </a-radio-group>
-                                    <div class="tip mt10">
-                                        <a-input-number disabled class="dialogInput" style="width: 200px" :min="0" placeholder="请输入调整金额" suffix="元" />
-                                    </div>
-                                </a-form-item>
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="24">
-                            <a-form-item label="备注" class="relative mt20 pl40">
-                                <a-input class="dialogInput" style="width: 600px" placeholder="请输入备注信息" v-model:value="formState.Remark" />
-                            </a-form-item>
-                        </a-col>
+                                                    ">
+                          减少</a-radio>
+                      </a-col>
+                    </a-row>
+                  </a-radio-group>
+                  <div class="tip mt10">
+                    <a-form-item name="ReckonAdjustAmount">
+                      <a-input-number v-model:value="formState.ReckonAdjustAmount" @change="formState.ReckonAdjustAmount = Math.abs(formState.ReckonAdjustAmount)" class="dialogInput" style="width: 200px" :min="0" placeholder="请输入调整金额" suffix="元" v-if="checkedObj.adjustAmount === 1" />
+                      <a-input-number v-model:value="formState.ReckonAdjustAmount" @change="formState.ReckonAdjustAmount = -1 * Math.abs(formState.ReckonAdjustAmount)" class="dialogInput" :min="0" style="width: 200px" placeholder="请输入调整金额" suffix="元" v-else />
+                    </a-form-item>
+                  </div>
+                </a-form-item>
+                <a-form-item class="relative" v-else>
+                  <a-radio-group class="commonRadioGroup" disabled>
+                    <a-row style="width: 200px">
+                      <a-col :span="12">
+                        <a-radio :value="1">增加</a-radio>
+                      </a-col>
+                      <a-col :span="12">
+                        <a-radio :value="2">减少</a-radio>
+                      </a-col>
                     </a-row>
-                </a-checkbox-group>
-                <a-form-item name="IsChecked"></a-form-item>
-            </a-form>
-        </fieldset>
-    </a-modal>
+                  </a-radio-group>
+                  <div class="tip mt10">
+                    <a-input-number disabled class="dialogInput" style="width: 200px" :min="0" placeholder="请输入调整金额" suffix="元" />
+                  </div>
+                </a-form-item>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="备注" class="relative mt20 pl40">
+                <a-input class="dialogInput" style="width: 600px" placeholder="请输入备注信息" v-model:value="formState.Remark" />
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-checkbox-group>
+        <a-form-item name="IsChecked"></a-form-item>
+      </a-form>
+    </fieldset>
+  </a-modal>
 </template>
 
 <script lang="ts">
@@ -255,6 +244,20 @@ export default defineComponent({
         const loading = ref<boolean>(false);
         const { rules, formState, formRef, checkedObj } = handleForm();
 
+        // 处理价格显示
+        const handlePrice = () => {
+            const { pricetype, price, pricedavg } = props.selectedRow;
+            //商品价格：如果是一口价合同，显示合同价；如果是点价合同，显示已点均价，如果没有点价，则显示0；如果是暂定价合同，优先显示已点均价，若没有点价，则显示暂定价；
+            switch (pricetype) {
+                case 1:
+                case 3:
+                    return formatValue(price + ' 元');
+                case 2:
+                    return formatValue(pricedavg + ' 元');
+            }
+            return 0 + ' 元';
+        };
+
         function submit() {
             const wrapEl = unref(formRef);
             wrapEl.validate().then((nameList: any) => {
@@ -315,6 +318,7 @@ export default defineComponent({
             rules,
             getPriceTypeName,
             checkedObj,
+            handlePrice,
         };
     },
 });

src/views/business/purchase/components/someprice/index.vue

@@ -1,20 +1,10 @@
 <template>
   <!-- 采购 点价登记-->
-  <a-modal class="commonModal someprice"
-           :title="selectedRow.contracttype===1? '采购合同-点价登记': '销售合同-点价登记'"
-           v-model:visible="visible"
-           @cancel="cancel"
-           centered
-           width="890px">
+  <a-modal class="commonModal someprice" :title="selectedRow.contracttype===1? '采购合同-点价登记': '销售合同-点价登记'" v-model:visible="visible" @cancel="cancel" centered width="890px">
     <template #footer>
-      <a-button key="submit"
-                class="cancelBtn"
-                @click="cancel">取消
+      <a-button key="submit" class="cancelBtn" @click="cancel">取消
       </a-button>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="submit">点价登记
+      <a-button key="submit" type="primary" :loading="loading" @click="submit">点价登记
       </a-button>
     </template>
     <fieldset class="formFieldSet">
@@ -47,8 +37,7 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="合同签署量">
-              <span
-                    class="white">{{ formatValue(selectedRow.qty + selectedRow.enumdicname) }}</span>
+              <span class="white">{{ formatValue(selectedRow.qty + selectedRow.enumdicname) }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
@@ -60,8 +49,7 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="点价合约">
-              <span
-                    class="white">{{ formatValue(selectedRow.goodsname) + selectedRow.currencyname }}</span>
+              <span class="white">{{ formatValue(selectedRow.goodsname) + selectedRow.currencyname }}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -86,19 +74,11 @@
     </fieldset>
     <fieldset class="formFieldSet">
       <legend>本次点价信息</legend>
-      <a-form class="inlineForm"
-              ref="formRef"
-              :model="formState"
-              :rules="rules">
+      <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
         <a-row :gutter="24">
           <a-col :span="12">
-            <a-form-item label="点价价格"
-                         name="PricedPrice">
-              <a-input-number class="dialogInput"
-                              style="width: 200px"
-                              v-model:value="formState.PricedPrice"
-                              :min="0"
-                              placeholder="请输入点价价格" />
+            <a-form-item label="点价价格" name="PricedPrice">
+              <a-input-number class="dialogInput" style="width: 200px" v-model:value="formState.PricedPrice" :min="0" placeholder="请输入点价价格" />
             </a-form-item>
           </a-col>
           <a-col :span="12">
@@ -111,27 +91,18 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="商品价格">
-              <span class="white">{{
-                                    (Number(selectedRow.pricemove) + Number(formState.PricedPrice)).toFixed(2)
-                                }}</span>
+              <span class="white">
+                {{(Number(selectedRow.pricemove) + Number(formState.PricedPrice)).toFixed(2)}}
+              </span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="点价数量"
-                         class="relative"
-                         name="PricedQty">
-              <a-input-number class="dialogInput"
-                              style="width: 200px"
-                              v-model:value="formState.PricedQty"
-                              :min="0"
-                              :max="selectedRow.unpricedqty"
-                              placeholder="请输入点价数量" />
+            <a-form-item label="点价数量" class="relative" name="PricedQty">
+              <a-input-number class="dialogInput" style="width: 200px" v-model:value="formState.PricedQty" :min="0" :max="selectedRow.unpricedqty" placeholder="请输入点价数量" />
               <div class="tip mt10">
-                <span>未定价量<span
-                        class="white">{{ selectedRow.unpricedqty }}{{ selectedRow.enumdicname }}</span>
+                <span>未定价量<span class="white">{{ selectedRow.unpricedqty }}{{ selectedRow.enumdicname }}</span>
                 </span>
-                <a class="blue ml10"
-                   @click="formState.PricedQty = selectedRow.unpricedqty"> 全部登记</a>
+                <a class="blue ml10" @click="formState.PricedQty = selectedRow.unpricedqty"> 全部登记</a>
               </div>
             </a-form-item>
           </a-col>

src/views/business/purchase/list/all/index.vue

@@ -68,7 +68,7 @@ export default defineComponent({
         // 权限按钮
         const buttons = getTableButton();
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList<Ermcp3SellBuyContract>();
+        const { loading, tableList, queryTable } = queryTableList<Ermcp3SellBuyContract>(true, 2);
 
         // 获取列表数据
         const queryTableAction = () => {

src/views/business/sell/components/settlement/index.vue

@@ -1,229 +1,219 @@
 <template>
-    <!-- 交收登记-->
-    <a-modal class="commonModal paddingDialog settlement" title="交收登记" v-model:visible="visible" @cancel="cancel" centered width="890px">
-        <template #footer>
-            <a-button key="submit" class="cancelBtn" @click="cancel">取消 </a-button>
-            <a-button key="submit" type="primary" :loading="loading" @click="submit">交收登记 </a-button>
-        </template>
-        <fieldset class="formFieldSet">
-            <legend>合同基本信息</legend>
-            <a-form class="inlineForm">
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="合同编号">
-                            <span class="white">{{ formatValue(selectedRow.contractno) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="定价类型">
-                            <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</span>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item :label="selectedRow.contracttype === 1 ? '采购方' : '销售方'">
-                            <span class="white">{{ formatValue(selectedRow.accountname) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="现货品种">
-                            <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="合同签署量">
-                            <span class="white">{{ formatValue(selectedRow.qty + selectedRow.enumdicname) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="商品价格">
-                            <span class="white">{{ formatValue(selectedRow.price) }}</span>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-            </a-form>
-        </fieldset>
-        <fieldset class="formFieldSet">
-            <legend>已登记信息</legend>
-            <a-form class="inlineForm">
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="已定价量">
-                            <span class="white">{{ selectedRow.pricedqty + ' ' + selectedRow.enumdicname }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="已交收量">
-                            <span class="white">{{ selectedRow.reckonrealqty + ' ' + selectedRow.enumdicname }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="调整金额">
-                            <span class="white">{{ selectedRow.reckonadjustamount + ' 元' }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="保证金">
-                            <span class="white">{{ selectedRow.margin + ' 元' }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="24">
-                        <a-form-item label="其他费用">
-                            <span class="white">{{ selectedRow.reckonotheramount + ' 元' }}</span>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-            </a-form>
-        </fieldset>
-        <fieldset class="formFieldSet">
-            <legend>本次交收信息</legend>
-            <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
-                <a-checkbox-group class="commonCheckboxGroup">
-                    <a-row>
-                        <a-col :span="12">
-                            <a-form-item class="relative">
-                                <template #label>
-                                    <a-checkbox value="交收量" v-model:checked="checkedObj.qty" @change="() => (checkedObj.qty = !checkedObj.qty)">交收量</a-checkbox>
-                                </template>
-                                <a-form-item class="relative" v-if="checkedObj.qty" name="ReckonRealQty">
-                                    <a-input-number v-model:value="formState.ReckonRealQty" class="dialogInput" style="width: 200px" :min="0" :max="selectedRow.unsureqty" placeholder="请输入交收量" suffix="单位" />
-                                    <div class="tip mt10"
-                                        ><span>待交收量：{{ selectedRow.unsureqty }}吨</span><a class="blue fr" @click="formState.ReckonRealQty = selectedRow.unsureqty">全部登记</a></div
-                                    >
-                                </a-form-item>
-                                <a-form-item class="relative" v-else>
-                                    <a-input-number disabled class="dialogInput" style="width: 200px" :min="0" placeholder="请输入交收量" suffix="单位" />
-                                    <div class="tip mt10"><span class="fl">未定价量：--吨</span><a class="blue fr">全部登记</a> </div>
-                                </a-form-item>
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="12">
-                            <a-form-item class="relative">
-                                <template #label>
-                                    <a-checkbox value="其他费用" v-model:checked="checkedObj.amount" @change="() => (checkedObj.amount = !checkedObj.amount)">其他费用</a-checkbox>
-                                </template>
-                                <a-form-item v-if="checkedObj.amount" name="ReckonOtherAmount">
-                                    <a-input-number v-model:value="formState.ReckonOtherAmount" class="dialogInput" style="width: 200px" placeholder="请输入其他费用" :min="0" suffix="元" />
-                                </a-form-item>
-                                <a-form-item v-else>
-                                    <a-input-number readonly class="dialogInput" style="width: 200px" placeholder="请输入其他费用" :min="0" suffix="元" />
-                                </a-form-item>
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="12" class="mt10">
-                            <a-form-item class="relative">
-                                <template #label>
-                                    <a-checkbox value="调整保证金" v-model:checked="checkedObj.margin" @change="() => (checkedObj.margin = !checkedObj.margin)">调整保证金 </a-checkbox>
-                                </template>
-                                <a-form-item class="relative" v-if="checkedObj.margin">
-                                    <a-radio-group class="commonRadioGroup" v-model:value="checkedObj.adjustMargin">
-                                        <a-row style="width: 200px">
-                                            <a-col :span="12">
-                                                <a-radio :value="1">追加</a-radio>
-                                            </a-col>
-                                            <a-col :span="12">
-                                                <a-radio :value="2">退还</a-radio>
-                                            </a-col>
-                                        </a-row>
-                                    </a-radio-group>
-                                    <div class="tip mt10">
-                                        <a-form-item name="AddMargin" v-if="checkedObj.adjustMargin === 1">
-                                            <a-input-number v-model:value="formState.AddMargin" class="dialogInput" style="width: 200px" :min="0" placeholder="请输入调整保证金" suffix="元" />
-                                        </a-form-item>
-                                        <a-form-item name="DecMargin" v-else>
-                                            <a-input-number v-model:value="formState.DecMargin" class="dialogInput" :min="0" style="width: 200px" placeholder="请输入调整保证金" suffix="元" />
-                                        </a-form-item>
-                                    </div>
-                                </a-form-item>
-                                <a-form-item class="relative" v-else>
-                                    <a-radio-group class="commonRadioGroup" disabled>
-                                        <a-row style="width: 200px">
-                                            <a-col :span="12">
-                                                <a-radio :value="1">追加</a-radio>
-                                            </a-col>
-                                            <a-col :span="12">
-                                                <a-radio :value="2">退还</a-radio>
-                                            </a-col>
-                                        </a-row>
-                                    </a-radio-group>
-                                    <div class="tip mt10">
-                                        <a-input-number disabled class="dialogInput" style="width: 200px" :min="0" placeholder="请输入调整保证金" suffix="元" />
-                                    </div>
-                                </a-form-item>
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="12" class="mt10">
-                            <a-form-item class="relative">
-                                <template #label>
-                                    <a-checkbox value="调整金额" v-model:checked="checkedObj.justAmount" @change="() => (checkedObj.justAmount = !checkedObj.justAmount)">调整金额 </a-checkbox>
-                                </template>
-                                <a-form-item class="relative" v-if="checkedObj.justAmount">
-                                    <a-radio-group class="commonRadioGroup" v-model:value="checkedObj.adjustAmount">
-                                        <a-row style="width: 200px">
-                                            <a-col :span="12">
-                                                <a-radio
-                                                    :value="1"
-                                                    @focus="
+  <!-- 交收登记-->
+  <a-modal class="commonModal paddingDialog settlement" title="交收登记" v-model:visible="visible" @cancel="cancel" centered width="890px">
+    <template #footer>
+      <a-button key="submit" class="cancelBtn" @click="cancel">取消 </a-button>
+      <a-button key="submit" type="primary" :loading="loading" @click="submit">交收登记 </a-button>
+    </template>
+    <fieldset class="formFieldSet">
+      <legend>合同基本信息</legend>
+      <a-form class="inlineForm">
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="合同编号">
+              <span class="white">{{ formatValue(selectedRow.contractno) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="定价类型">
+              <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item :label="selectedRow.contracttype === 1 ? '采购方' : '销售方'">
+              <span class="white">{{ formatValue(selectedRow.accountname) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="现货品种">
+              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="合同签署量">
+              <span class="white">{{ formatValue(selectedRow.qty + selectedRow.enumdicname) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="商品价格">
+              <span class="white">{{ handlePrice() }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </fieldset>
+    <fieldset class="formFieldSet">
+      <legend>已登记信息</legend>
+      <a-form class="inlineForm">
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="已定价量">
+              <span class="white">{{ selectedRow.pricedqty + ' ' + selectedRow.enumdicname }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="已交收量">
+              <span class="white">{{ selectedRow.reckonrealqty + ' ' + selectedRow.enumdicname }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="调整金额">
+              <span class="white">{{ selectedRow.reckonadjustamount + ' 元' }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="保证金">
+              <span class="white">{{ selectedRow.margin + ' 元' }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="其他费用">
+              <span class="white">{{ selectedRow.reckonotheramount + ' 元' }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </fieldset>
+    <fieldset class="formFieldSet">
+      <legend>本次交收信息</legend>
+      <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
+        <a-checkbox-group class="commonCheckboxGroup">
+          <a-row>
+            <a-col :span="12">
+              <a-form-item class="relative">
+                <template #label>
+                  <a-checkbox value="交收量" v-model:checked="checkedObj.qty" @change="() => (checkedObj.qty = !checkedObj.qty)">交收量</a-checkbox>
+                </template>
+                <a-form-item class="relative" v-if="checkedObj.qty" name="ReckonRealQty">
+                  <a-input-number v-model:value="formState.ReckonRealQty" class="dialogInput" style="width: 200px" :min="0" :max="selectedRow.unsureqty" placeholder="请输入交收量" suffix="单位" />
+                  <div class="tip mt10"><span>待交收量：{{ selectedRow.unsureqty }}吨</span><a class="blue fr" @click="formState.ReckonRealQty = selectedRow.unsureqty">全部登记</a></div>
+                </a-form-item>
+                <a-form-item class="relative" v-else>
+                  <a-input-number disabled class="dialogInput" style="width: 200px" :min="0" placeholder="请输入交收量" suffix="单位" />
+                  <div class="tip mt10"><span class="fl">未定价量：--吨</span><a class="blue fr">全部登记</a> </div>
+                </a-form-item>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item class="relative">
+                <template #label>
+                  <a-checkbox value="其他费用" v-model:checked="checkedObj.amount" @change="() => (checkedObj.amount = !checkedObj.amount)">其他费用</a-checkbox>
+                </template>
+                <a-form-item v-if="checkedObj.amount" name="ReckonOtherAmount">
+                  <a-input-number v-model:value="formState.ReckonOtherAmount" class="dialogInput" style="width: 200px" placeholder="请输入其他费用" :min="0" suffix="元" />
+                </a-form-item>
+                <a-form-item v-else>
+                  <a-input-number readonly class="dialogInput" style="width: 200px" placeholder="请输入其他费用" :min="0" suffix="元" />
+                </a-form-item>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12" class="mt10">
+              <a-form-item class="relative">
+                <template #label>
+                  <a-checkbox value="调整保证金" v-model:checked="checkedObj.margin" @change="() => (checkedObj.margin = !checkedObj.margin)">调整保证金 </a-checkbox>
+                </template>
+                <a-form-item class="relative" v-if="checkedObj.margin">
+                  <a-radio-group class="commonRadioGroup" v-model:value="checkedObj.adjustMargin">
+                    <a-row style="width: 200px">
+                      <a-col :span="12">
+                        <a-radio :value="1">追加</a-radio>
+                      </a-col>
+                      <a-col :span="12">
+                        <a-radio :value="2">退还</a-radio>
+                      </a-col>
+                    </a-row>
+                  </a-radio-group>
+                  <div class="tip mt10">
+                    <a-form-item name="AddMargin" v-if="checkedObj.adjustMargin === 1">
+                      <a-input-number v-model:value="formState.AddMargin" class="dialogInput" style="width: 200px" :min="0" placeholder="请输入调整保证金" suffix="元" />
+                    </a-form-item>
+                    <a-form-item name="DecMargin" v-else>
+                      <a-input-number v-model:value="formState.DecMargin" class="dialogInput" :min="0" style="width: 200px" placeholder="请输入调整保证金" suffix="元" />
+                    </a-form-item>
+                  </div>
+                </a-form-item>
+                <a-form-item class="relative" v-else>
+                  <a-radio-group class="commonRadioGroup" disabled>
+                    <a-row style="width: 200px">
+                      <a-col :span="12">
+                        <a-radio :value="1">追加</a-radio>
+                      </a-col>
+                      <a-col :span="12">
+                        <a-radio :value="2">退还</a-radio>
+                      </a-col>
+                    </a-row>
+                  </a-radio-group>
+                  <div class="tip mt10">
+                    <a-input-number disabled class="dialogInput" style="width: 200px" :min="0" placeholder="请输入调整保证金" suffix="元" />
+                  </div>
+                </a-form-item>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12" class="mt10">
+              <a-form-item class="relative">
+                <template #label>
+                  <a-checkbox value="调整金额" v-model:checked="checkedObj.justAmount" @change="() => (checkedObj.justAmount = !checkedObj.justAmount)">调整金额 </a-checkbox>
+                </template>
+                <a-form-item class="relative" v-if="checkedObj.justAmount">
+                  <a-radio-group class="commonRadioGroup" v-model:value="checkedObj.adjustAmount">
+                    <a-row style="width: 200px">
+                      <a-col :span="12">
+                        <a-radio :value="1" @focus="
                                                         () => {
                                                             formState.ReckonAdjustAmount ? (formState.ReckonAdjustAmount = Math.abs(formState.ReckonAdjustAmount)) : 0;
                                                         }
-                                                    "
-                                                >
-                                                    增加</a-radio
-                                                >
-                                            </a-col>
-                                            <a-col :span="12">
-                                                <a-radio
-                                                    :value="2"
-                                                    @focus="
+                                                    ">
+                          增加</a-radio>
+                      </a-col>
+                      <a-col :span="12">
+                        <a-radio :value="2" @focus="
                                                         () => {
                                                             formState.ReckonAdjustAmount ? (formState.ReckonAdjustAmount = -1 * Math.abs(formState.ReckonAdjustAmount)) : 0;
                                                         }
-                                                    "
-                                                >
-                                                    减少</a-radio
-                                                >
-                                            </a-col>
-                                        </a-row>
-                                    </a-radio-group>
-                                    <div class="tip mt10">
-                                        <a-form-item name="ReckonAdjustAmount">
-                                            <a-input-number v-model:value="formState.ReckonAdjustAmount" @change="formState.ReckonAdjustAmount = Math.abs(formState.ReckonAdjustAmount)" class="dialogInput" style="width: 200px" placeholder="请输入调整金额" :min="0" suffix="元" v-if="checkedObj.adjustAmount === 1" />
-                                            <a-input-number v-model:value="formState.ReckonAdjustAmount" @change="formState.ReckonAdjustAmount = -1 * Math.abs(formState.ReckonAdjustAmount)" class="dialogInput" :min="0" style="width: 200px" placeholder="请输入调整金额" suffix="元" v-else />
-                                        </a-form-item>
-                                    </div>
-                                </a-form-item>
-                                <a-form-item class="relative" v-else>
-                                    <a-radio-group class="commonRadioGroup" disabled>
-                                        <a-row style="width: 200px">
-                                            <a-col :span="12">
-                                                <a-radio :value="1">增加</a-radio>
-                                            </a-col>
-                                            <a-col :span="12">
-                                                <a-radio :value="2">减少</a-radio>
-                                            </a-col>
-                                        </a-row>
-                                    </a-radio-group>
-                                    <div class="tip mt10">
-                                        <a-input-number disabled class="dialogInput" style="width: 200px" placeholder="请输入调整金额" :min="0" suffix="元" />
-                                    </div>
-                                </a-form-item>
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="24">
-                            <a-form-item label="备注" class="relative mt20 pl40">
-                                <a-input class="dialogInput" style="width: 600px" placeholder="请输入备注信息" v-model:value="formState.Remark" />
-                            </a-form-item>
-                        </a-col>
+                                                    ">
+                          减少</a-radio>
+                      </a-col>
+                    </a-row>
+                  </a-radio-group>
+                  <div class="tip mt10">
+                    <a-form-item name="ReckonAdjustAmount">
+                      <a-input-number v-model:value="formState.ReckonAdjustAmount" @change="formState.ReckonAdjustAmount = Math.abs(formState.ReckonAdjustAmount)" class="dialogInput" style="width: 200px" placeholder="请输入调整金额" :min="0" suffix="元" v-if="checkedObj.adjustAmount === 1" />
+                      <a-input-number v-model:value="formState.ReckonAdjustAmount" @change="formState.ReckonAdjustAmount = -1 * Math.abs(formState.ReckonAdjustAmount)" class="dialogInput" :min="0" style="width: 200px" placeholder="请输入调整金额" suffix="元" v-else />
+                    </a-form-item>
+                  </div>
+                </a-form-item>
+                <a-form-item class="relative" v-else>
+                  <a-radio-group class="commonRadioGroup" disabled>
+                    <a-row style="width: 200px">
+                      <a-col :span="12">
+                        <a-radio :value="1">增加</a-radio>
+                      </a-col>
+                      <a-col :span="12">
+                        <a-radio :value="2">减少</a-radio>
+                      </a-col>
                     </a-row>
-                </a-checkbox-group>
-                <a-form-item name="IsChecked"></a-form-item>
-            </a-form>
-        </fieldset>
-    </a-modal>
+                  </a-radio-group>
+                  <div class="tip mt10">
+                    <a-input-number disabled class="dialogInput" style="width: 200px" placeholder="请输入调整金额" :min="0" suffix="元" />
+                  </div>
+                </a-form-item>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="备注" class="relative mt20 pl40">
+                <a-input class="dialogInput" style="width: 600px" placeholder="请输入备注信息" v-model:value="formState.Remark" />
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-checkbox-group>
+        <a-form-item name="IsChecked"></a-form-item>
+      </a-form>
+    </fieldset>
+  </a-modal>
 </template>
 
 <script lang="ts">
@@ -250,6 +240,21 @@ export default defineComponent({
         const { visible, cancel } = _closeModal(context);
         const loading = ref<boolean>(false);
         const { rules, formState, formRef, checkedObj } = handleForm();
+
+        // 处理价格显示
+        const handlePrice = () => {
+            const { pricetype, price, pricedavg } = props.selectedRow;
+            //商品价格：如果是一口价合同，显示合同价；如果是点价合同，显示已点均价，如果没有点价，则显示0；如果是暂定价合同，优先显示已点均价，若没有点价，则显示暂定价；
+            switch (pricetype) {
+                case 1:
+                case 3:
+                    return formatValue(price + ' 元');
+                case 2:
+                    return formatValue(pricedavg + ' 元');
+            }
+            return 0 + ' 元';
+        };
+
         function submit() {
             const wrapEl = unref(formRef);
             wrapEl.validate().then((nameList: any) => {
@@ -309,6 +314,7 @@ export default defineComponent({
             rules,
             getPriceTypeName,
             checkedObj,
+            handlePrice,
         };
     },
 });

src/views/business/sell/list/all/index.vue

@@ -1,35 +1,35 @@
 <template>
-    <!-- 销售合同: 特点价合同-待交收合同-->
-    <div class="sell-peddding" :loading="loading">
-        <filterCustomTable @search="updateColumn"></filterCustomTable>
-        <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
-            <!-- 额外的展开行 -->
-            <template #expandedRowRender="{ record }">
-                <mtp-table-button class="btn-list-sticky" :buttons="buttons" :record="record" @click="openComponent" />
-            </template>
-            <template #pricedqty="{ text, record }">
-                <span>{{ handleEnumdic(text, record) }}</span>
-            </template>
-            <template #unsureqty="{ text, record }">
-                <span>{{ handleEnumdic(text, record) }}</span>
-            </template>
-            <template #qty="{ text, record }">
-                <span>{{ handleEnumdic(text, record) }}</span>
-            </template>
-            <template #unpricedqty="{ text, record }">
-                <span>{{ handleEnumdic(text, record) }}</span>
-            </template>
-            <template #deliverystartdate,deliveryenddate="{ record }">
-                <span>{{ formatValue(formatTime(record.deliverystartdate, 'd') + '--' + formatTime(record.deliveryenddate, 'd')) }}</span>
-            </template>
-            <template #startdate,enddate="{ record }">
-                <span>{{ formatValue(formatTime(record.startdate, 'd') + '--' + formatTime(record.enddate, 'd')) }}</span>
-            </template>
-        </a-table>
-        <!-- 右键 -->
-        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="buttons"> </contextMenu>
-        <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
-    </div>
+  <!-- 销售合同: 特点价合同-待交收合同-->
+  <div class="sell-peddding" :loading="loading">
+    <filterCustomTable @search="updateColumn"></filterCustomTable>
+    <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
+      <!-- 额外的展开行 -->
+      <template #expandedRowRender="{ record }">
+        <mtp-table-button class="btn-list-sticky" :buttons="buttons" :record="record" @click="openComponent" />
+      </template>
+      <template #pricedqty="{ text, record }">
+        <span>{{ handleEnumdic(text, record) }}</span>
+      </template>
+      <template #unsureqty="{ text, record }">
+        <span>{{ handleEnumdic(text, record) }}</span>
+      </template>
+      <template #qty="{ text, record }">
+        <span>{{ handleEnumdic(text, record) }}</span>
+      </template>
+      <template #unpricedqty="{ text, record }">
+        <span>{{ handleEnumdic(text, record) }}</span>
+      </template>
+      <template #deliverystartdate,deliveryenddate="{ record }">
+        <span>{{ formatValue(formatTime(record.deliverystartdate, 'd') + '--' + formatTime(record.deliveryenddate, 'd')) }}</span>
+      </template>
+      <template #startdate,enddate="{ record }">
+        <span>{{ formatValue(formatTime(record.startdate, 'd') + '--' + formatTime(record.enddate, 'd')) }}</span>
+      </template>
+    </a-table>
+    <!-- 右键 -->
+    <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="buttons"> </contextMenu>
+    <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
+  </div>
 </template>
 
 <script lang="ts">
@@ -62,7 +62,7 @@ export default defineComponent({
         // 权限按钮
         const buttons = getTableButton();
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList<Ermcp3SellBuyContract>();
+        const { loading, tableList, queryTable } = queryTableList<Ermcp3SellBuyContract>(true, 2);
 
         // 获取列表数据
         const queryTableAction = () => {

src/views/information/custom/index.vue

@@ -1,32 +1,31 @@
 <template>
-    <!-- 客户资料 -->
-    <div class="plan_uncommitted" :loading="loading">
-        <Filter @search="updateColumn">
-            <mtp-table-button class="btn-list-sticky" :buttons="addButton" @click="openComponent" />
-        </Filter>
-        <a-table :columns="getColumns(columns)" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
-            <!-- 额外的展开行 -->
-            <template #expandedRowRender="{ record }">
-                <mtp-table-button class="btn-list-sticky" :buttons="buttons" :record="record" @click="openComponent" />
-            </template>
-            <template #status="{ text }">
-                <a>{{ getStatusName(text) }}</a>
-            </template>
-            <template #userinfotype="{ text }">
-                <a>{{ getUserInfoTypeName(text) }}</a>
-            </template>
-            <template #attachment1="{ text, record }">
-                <a>{{ text }}</a
-                ><a>{{ record.attachment2 }}</a>
-            </template>
-            <template #cardtype="{ text }">
-                <a>{{ getCardTypeEnumItemName(text) }}</a>
-            </template>
-        </a-table>
-        <!-- 右键 -->
-        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="buttons"> </contextMenu>
-        <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"> </component>
-    </div>
+  <!-- 客户资料 -->
+  <div class="plan_uncommitted" :loading="loading">
+    <Filter @search="updateColumn">
+      <mtp-table-button class="btn-list-sticky" :buttons="addButton" @click="openComponent" />
+    </Filter>
+    <a-table :columns="getColumns(columns)" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
+      <!-- 额外的展开行 -->
+      <template #expandedRowRender="{ record }">
+        <mtp-table-button class="btn-list-sticky" :buttons="handleBtnList(buttons,record)" :record="record" @click="openComponent" />
+      </template>
+      <template #status="{ text }">
+        <a>{{ getStatusName(text) }}</a>
+      </template>
+      <template #userinfotype="{ text }">
+        <a>{{ getUserInfoTypeName(text) }}</a>
+      </template>
+      <template #attachment1="{ text, record }">
+        <a>{{ text }}</a><a>{{ record.attachment2 }}</a>
+      </template>
+      <template #cardtype="{ text }">
+        <a>{{ getCardTypeEnumItemName(text) }}</a>
+      </template>
+    </a-table>
+    <!-- 右键 -->
+    <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="buttons"> </contextMenu>
+    <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"> </component>
+  </div>
 </template>
 
 <script lang="ts">
@@ -41,6 +40,7 @@ import Filter from './compoments/filterTable/index.vue';
 import { pingan_custom_column } from './setup';
 import { ColumnType } from '@/common/methods/table';
 import { getTableColumns } from '@/common/setup/table';
+import { BtnListType } from '@/common/components/btnList/interface';
 
 export default defineComponent({
     name: EnumRouterName.plan_audit,
@@ -80,6 +80,18 @@ export default defineComponent({
             }
         };
 
+        // 处理根据状态显示对应按钮
+        const handleBtnList = (btnList: BtnListType[], item: QueryCustomInfoType) => {
+            switch (item.status) {
+                case 2: // 待审核
+                    return btnList.filter((e) => e.code !== 'modify');
+                case 5: // 拒绝审核
+                    return btnList.filter((e) => e.code !== 'check');
+                default:
+                    return btnList;
+            }
+        };
+
         // 表头
         const getColumns = (columns: ColumnType[]) => {
             if (isPingAnOem()) {
@@ -115,6 +127,7 @@ export default defineComponent({
             getUserInfoTypeName,
             getCardTypeEnumItemName,
             getColumns,
+            handleBtnList,
         };
     },
 });

src/views/information/spot-contract/list/purchase/index.vue

@@ -8,7 +8,7 @@
       <!-- 额外的展开行 -->
       <!-- 额外的展开行 -->
       <template #expandedRowRender="{ record }">
-        <mtp-table-button class="btn-list-sticky" :buttons="secondBtn" :record="record" @click="openComponent" />
+        <mtp-table-button class="btn-list-sticky" :buttons="handleBtnList(secondBtn,record)" :record="record" @click="openComponent" />
       </template>
       <template #biztype="{ text }">
         <a>{{ getBizTypeName(text) }}</a>
@@ -63,6 +63,7 @@ import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
 import { QuerySpotContract } from '@/services/go/ermcp/spot-contract';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { getTableButton } from '@/common/setup/table/button';
+import { BtnListType } from '@/common/components/btnList/interface';
 import { useRoute } from 'vue-router';
 
 export default defineComponent({
@@ -73,7 +74,8 @@ export default defineComponent({
         detail: defineAsyncComponent(() => import('../../components/detail/index.vue')),
         add: defineAsyncComponent(() => import('../../components/add/index.vue')),
         resubmit: defineAsyncComponent(() => import('../../components/modify/index.vue')),
-        cancel: defineAsyncComponent(() => import('../../components/delete/index.vue')),
+        cancel: defineAsyncComponent(() => import('../../components/cancel/index.vue')),
+        delete: defineAsyncComponent(() => import('../../components/delete/index.vue')),
         MtpTableButton,
     },
     setup() {
@@ -100,14 +102,20 @@ export default defineComponent({
             queryBusinessManager();
         };
 
-        // function handleButton(item: Ermcp3ContractRsp) {
-        //     const { contracctstatus } = item;
-        //     if (['']) {
-        //         return btnList;
-        //     } else {
-        //         return btnList.filter((e) => e.code === 'detail');
-        //     }
-        // }
+        // 处理根据状态显示对应按钮
+        const handleBtnList = (btnList: BtnListType[], item: Ermcp3ContractRsp) => {
+            switch (item.contracctstatus) {
+                case 1: // 待审核
+                case 2: // 执行中
+                case 3: // 正常完结
+                case 5: // 异常完结
+                    return btnList.filter((e) => e.code !== 'delete');
+                case 6: // 已撤回
+                    return btnList.filter((e) => e.code !== 'cancel');
+                default:
+                    return btnList;
+            }
+        };
 
         // 表格通用逻辑
         const param: ComposeTableParam = {
@@ -133,6 +141,7 @@ export default defineComponent({
             handleEnumdic,
             firstBtn,
             secondBtn,
+            handleBtnList,
         };
     },
 });