【修改】注释不能上线代码

src/views/supply/apply/engin_list.vue

@@ -164,7 +164,8 @@
             :summary-method="$getSummaries"
             @selection-change="handleSelectionChange"
           >
-            <el-table-column align="center" type="selection" width="55" fixed="left" :selectable="selectable" />
+            <!--            :selectable="selectable"-->
+            <el-table-column align="center" type="selection" width="55" fixed="left" />
             <el-table-column align="left" label="订单类型" prop="type" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.type | orderTypeFilter }}
@@ -282,7 +283,7 @@
             <el-table-column align="center" label="操作" width="180" fixed="right">
               <template slot-scope="scope">
                 <el-popconfirm
-                  v-if=" !scope.row.automaticStatus && $checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'SAVE'"
+                  v-if=" $checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'SAVE'"
                   style="margin-right: 10px;"
                   title="确定申请吗？"
                   @onConfirm="handleSubmit(scope.row.id, 'WAIT')"
@@ -290,7 +291,7 @@
                   <el-button slot="reference" type="text">申请</el-button>
                 </el-popconfirm>
                 <el-popconfirm
-                  v-if="!scope.row.automaticStatus &&$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'WAIT'"
+                  v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'WAIT'"
                   style="margin-right: 10px;"
                   title="确定撤回吗？"
                   @onConfirm="handleSubmit(scope.row.id, 'SAVE')"
@@ -298,7 +299,7 @@
                   <el-button slot="reference" type="text">撤回</el-button>
                 </el-popconfirm>
                 <el-popconfirm
-                  v-if="!scope.row.automaticStatus &&$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'"
+                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'"
                   style="margin-right: 10px;"
                   title="确定弃审吗？"
                   @onConfirm="handleAbandon(scope.row.id)"
@@ -306,21 +307,21 @@
                   <el-button slot="reference" type="text">弃审</el-button>
                 </el-popconfirm>
                 <el-button
-                  v-if="!scope.row.automaticStatus &&$checkBtnRole('edit', $route.meta.roles) && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') && scope.row.type === 1"
+                  v-if="$checkBtnRole('edit', $route.meta.roles) && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') && scope.row.type === 1"
                   type="text"
                   @click="toForm(scope.row)"
                 >
                   编辑
                 </el-button>
                 <el-button
-                  v-if="!scope.row.automaticStatus &&$checkBtnRole('edit', $route.meta.roles) && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') && scope.row.type === 2"
+                  v-if="$checkBtnRole('edit', $route.meta.roles) && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') && scope.row.type === 2"
                   type="text"
                   @click="toReturnForm(scope.row)"
                 >
                   编辑
                 </el-button>
                 <el-button
-                  v-if="!scope.row.automaticStatus &&$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'"
+                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'"
                   type="text"
                   @click="toExamine(scope.row)"
                 >
@@ -332,8 +333,9 @@
                 >
                   详情
                 </el-button>
+                <!--             !scope.row.automaticStatus &&  -->
                 <el-popconfirm
-                  v-if="!scope.row.automaticStatus &&scope.row.examineStatus !== 'OK'"
+                  v-if="scope.row.examineStatus !== 'OK'"
                   style="margin-left: 10px;"
                   title="确定删除吗？"
                   @onConfirm="handleDelete(scope.row.id)"

src/views/supply/engin/components/commerce_detail.vue

@@ -149,15 +149,15 @@
               <div class="label">审批说明</div>
               <div class="value">{{ detailData.examineNote }}</div>
             </el-col>
-            <el-col :span="24" class="item">
-              <div class="label">计划单</div>
-              <div class="value">
-                <el-checkbox v-model="detailData.isPlanOrder" disabled true-label="true" false-label="false">
-                  {{ detailData.isPlanOrder=='true'?'是':'否' }}
-                </el-checkbox>
-
-              </div>
-            </el-col>
+            <!--            <el-col :span="24" class="item">-->
+            <!--              <div class="label">计划单</div>-->
+            <!--              <div class="value">-->
+            <!--                <el-checkbox v-model="detailData.isPlanOrder" disabled true-label="true" false-label="false">-->
+            <!--                  {{ detailData.isPlanOrder=='true'?'是':'否' }}-->
+            <!--                </el-checkbox>-->
+
+            <!--              </div>-->
+            <!--            </el-col>-->
           </el-row>
         </div>
 

src/views/supply/engin/components/commerce_examine.vue

@@ -133,15 +133,15 @@
           <div class="label">关闭日期</div>
           <div class="value">{{ detailData.closeTime }}</div>
         </el-col>
-        <el-col :span="24" class="item">
-          <div class="label">计划单</div>
-          <div class="value">
-            <el-checkbox v-model="detailData.isPlanOrder" disabled true-label="true" false-label="false">
-              {{ detailData.isPlanOrder=='true'?'是':'否' }}
-            </el-checkbox>
+        <!--        <el-col :span="24" class="item">-->
+        <!--          <div class="label">计划单</div>-->
+        <!--          <div class="value">-->
+        <!--            <el-checkbox v-model="detailData.isPlanOrder" disabled true-label="true" false-label="false">-->
+        <!--              {{ detailData.isPlanOrder=='true'?'是':'否' }}-->
+        <!--            </el-checkbox>-->
 
-          </div>
-        </el-col>
+        <!--          </div>-->
+        <!--        </el-col>-->
       </el-row>
     </div>
 

src/views/supply/engin/components/commerce_form.vue

@@ -175,11 +175,11 @@
             <el-input v-model="mainForm.examineRemark" placeholder="请输入审批说明" disabled />
           </el-form-item>
         </el-col>
-        <el-col :xs="24" :sm="24" :lg="24">
-          <el-form-item>
-            <el-checkbox v-model="isPlanOrder" :disabled="listItem" true-label="true" false-label="false">计划单</el-checkbox>
-          </el-form-item>
-        </el-col>
+        <!--        <el-col :xs="24" :sm="24" :lg="24">-->
+        <!--          <el-form-item>-->
+        <!--            <el-checkbox v-model="isPlanOrder" :disabled="listItem" true-label="true" false-label="false">计划单</el-checkbox>-->
+        <!--          </el-form-item>-->
+        <!--        </el-col>-->
 
       </el-row>
     </el-form>

src/views/supply/engin/components/commerce_return.vue

@@ -116,15 +116,15 @@
           <div class="label">关闭日期</div>
           <div class="value">{{ detailData.closeTime }}</div>
         </el-col>
-        <el-col :span="24" class="item">
-          <div class="label">计划单</div>
-          <div class="value">
-            <el-checkbox v-model="detailData.isPlanOrder" disabled true-label="true" false-label="false">
-              {{ detailData.isPlanOrder=='true'?'是':'否' }}
-            </el-checkbox>
+        <!--        <el-col :span="24" class="item">-->
+        <!--          <div class="label">计划单</div>-->
+        <!--          <div class="value">-->
+        <!--            <el-checkbox v-model="detailData.isPlanOrder" disabled true-label="true" false-label="false">-->
+        <!--              {{ detailData.isPlanOrder=='true'?'是':'否' }}-->
+        <!--            </el-checkbox>-->
 
-          </div>
-        </el-col>
+        <!--          </div>-->
+        <!--        </el-col>-->
       </el-row>
     </div>
 

src/views/supply/implement/commercial_implement_list.vue

@@ -110,10 +110,22 @@
             <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip />
             <el-table-column align="left" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip />
             <el-table-column align="left" label="数量" prop="qty" min-width="160" show-overflow-tooltip />
-            <el-table-column align="left" label="单价" prop="price" min-width="160" show-overflow-tooltip />
-            <el-table-column align="left" label="金额" prop="totalAmount" min-width="160" show-overflow-tooltip />
+            <el-table-column align="left" label="单价" prop="price" min-width="160" show-overflow-tooltip>
+              <template v-slot="scope">
+                {{ scope.row.price| numToFixed }}
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="金额" prop="totalAmount" min-width="160" show-overflow-tooltip>
+              <template v-slot="scope">
+                {{ scope.row.totalAmount| numToFixed }}
+              </template>
+            </el-table-column>
             <el-table-column align="left" label="未订数量" prop="wdQty" min-width="160" show-overflow-tooltip />
-            <el-table-column align="left" label="未订金额" prop="wdAmount" min-width="160" show-overflow-tooltip />
+            <el-table-column align="left" label="未订金额" prop="wdAmount" min-width="160" show-overflow-tooltip>
+              <template v-slot="scope">
+                {{ scope.row.wdAmount| numToFixed }}
+              </template>
+            </el-table-column>
             <el-table-column align="left" label="直调数量" prop="directTransferQty" min-width="160" show-overflow-tooltip />
             <el-table-column align="left" label="退订数量" prop="retiredQty" min-width="160" show-overflow-tooltip />
             <el-table-column align="left" label="退货数量" prop="refundProductQty" min-width="160" show-overflow-tooltip />
@@ -255,8 +267,8 @@ export default {
       }
       getExecList(params).then((res) => {
         res.data.records.forEach(item => {
-          item.sums1 = ['refundableQty', 'qty', 'retiredQty', 'hasSendQty', 'directTransferQty', 'refundProductQty']
-          item.sums2 = ['payAmount', 'payRebateAmount', 'hasSendAmount', 'retiredAmount', 'refundProductAmount']
+          item.sums1 = ['refundableQty', 'qty', 'retiredQty', 'hasSendQty', 'directTransferQty', 'refundProductQty', 'wdQty']
+          item.sums2 = ['payAmount', 'payRebateAmount', 'hasSendAmount', 'retiredAmount', 'refundProductAmount', 'totalAmount', 'price', 'wdAmount']
         })
         this.dataList = res.data.records
         this.listTotal = res.data.total