bug修复

src/Form/marketing2/agent/edit.vue

@@ -188,6 +188,7 @@
 </template>
 
 <script>
+import enterprise from '@/template/enterprise/index.vue'
 import selectAgent from '@/components/selectAgent/index.vue'
 
 export default {
@@ -266,7 +267,7 @@ export default {
     }
   },
   components:{
-    selectAgent
+    selectAgent,enterprise
   },
   methods:{
     onShow () {
@@ -311,6 +312,7 @@ export default {
           this.radio = 1
           break;
       }
+      this.$refs.ent.form.enterprisename = res.data.enterprisename
     },
     async queryEnterpriseArchives () {
       const res = await this.$api.requested({

src/HDrpManagement/projectData/index.vue

@@ -1576,6 +1576,9 @@
                           <span style="color:#52c41a" v-else-if="scope.data.data[[scope.data.columnname]] == '跟进中'">{{$t(scope.data.data[[scope.data.columnname]])}}</span>
                           <span style="color:#999999" v-else-if="scope.data.data[[scope.data.columnname]] == '已失败' || scope.data.data[[scope.data.columnname]] == '已结案'">{{$t(scope.data.data[[scope.data.columnname]])}}</span>
                         </div>
+                        <div v-else-if="scope.data.columnname == 'scale'">
+                          {{scope.data.data.scale ? scope.data.data.scale + scope.data.data.unitname : '' }}
+                        </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
                           <drawerTemp class="inline-16" v-if="detailPath" :data="scope.data.data" :detailPath="detailPath" :idName="idName"  :disabled="isFull"
                                       :listqueryid="detailDataSet.unfllowTable.listqueryid" :total="detailDataSet.unfllowTable.total" :overview="false"></drawerTemp>

src/HDrpManagement/recvoucher/index.vue

@@ -51,6 +51,9 @@
         <div v-if="scope.data.column.columnname == 'amount'">
           <span :style="+scope.data.column.data.amount >= 0 ? 'color:green' : 'color:red'">{{ tool.formatAmount(scope.data.column.data.amount,2) }}</span>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'unwriteoffamount'">
+          <span >{{ tool.formatAmount(scope.data.column.data.unwriteoffamount,2) }}</span>
+        </div>
         <div v-else-if="scope.data.column.columnname == 'status'">
           <span :style="tool.getStatusColor(scope.data.column.data[[scope.data.column.columnname]])">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
         </div>

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -159,7 +159,14 @@
               @blur="onConfirm([scope.column.data], true, true)"
             ></el-input>
           </div>
-          <p v-else>{{ $t(scope.column.data[scope.column.columnname]) }}</p>
+          <div v-else-if="scope.column.columnname == 'cansaleqty' || scope.column.columnname == 'undeliqty' || scope.column.columnname == 'aftersalesmagqty'">
+            {{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'0'}}
+          </div>
+          <div v-else-if="scope.column.columnname == 'invoiceamount' || scope.column.columnname == 'writeoffamount' || scope.column.columnname == 'aftersalesmagamount'">
+            {{scope.column.data[scope.column.columnname]?tool.formatAmount(scope.column.data[scope.column.columnname],2,'¥'):'¥0.00'}}
+          </div>
+          <div v-else-if="scope.column.columnname == 'operation'"></div>
+          <p v-else>{{ $t(scope.column.data[scope.column.columnname]) || '--'}}</p>
         </template>
         <template v-slot:opreation="scope">
           <!-- <el-button v-if="data.status == '新建' && data.type != '特殊订单'" type="text" size="mini" @click="deleteOrderProduct(scope.data)">{{$t('删 除')}}</el-button> -->

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -96,7 +96,7 @@
               :label="$t(`输入数量`)"
               @change="qtyChange(scope.column.data, scope.$index)"
             ></el-input-number>
-            <span v-else>{{ scope.column.data.qty }}</span>
+            <span v-else>{{ scope.column.data.qty?scope.column.data.qty:'0' }}</span>
           </div>
           <div v-else-if="scope.column.columnname === 'needdate'">
             <el-date-picker
@@ -165,7 +165,14 @@
               @blur="onConfirm([scope.column.data], true, true)"
             ></el-input>
           </div>
-          <p v-else>{{ $t(scope.column.data[scope.column.columnname]) }}</p>
+          <div v-else-if="scope.column.columnname == 'cansaleqty' || scope.column.columnname == 'undeliqty' || scope.column.columnname == 'aftersalesmagqty'">
+            {{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'0'}}
+          </div>
+          <div v-else-if="scope.column.columnname == 'invoiceamount' || scope.column.columnname == 'writeoffamount' || scope.column.columnname == 'aftersalesmagamount'">
+            {{scope.column.data[scope.column.columnname]?tool.formatAmount(scope.column.data[scope.column.columnname],2,'¥'):'¥0.00'}}
+          </div>
+          <div v-else-if="scope.column.columnname == 'operation'"></div>
+          <p v-else>{{ $t(scope.column.data[scope.column.columnname]) || '--' }}</p>
         </template>
         <template v-slot:opreation="scope">
           <el-button