前：1期bug

src/dashoo.cn/frontend_web/src/components/oilsupplier/goodsinfo.vue

@@ -732,7 +732,7 @@
             </viewer>
           </template>
         </el-table-column>
-        <el-table-column prop="FileUrlList" label="描述" show-overflow-tooltip>
+        <el-table-column prop="FileUrlList" label="描述" show-overflow-tooltip>{{scenefile.Remark}}
         </el-table-column>
         <el-table-column label="操作" width="150" align="center" fixed>
           <template slot-scope="scope">
@@ -758,7 +758,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="描述">
-              <el-input v-model="SubfileForm.OtherRemark" type="textarea" :rows=3 placeholder="请输入备注信息"></el-input>
+              <el-input v-model="SubfileForm.Remark" type="textarea" :rows=3 placeholder="请输入备注信息"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -995,7 +995,8 @@ export default {
       scenefileurllist: [],
       scenefile: {
         FileUrl: '',
-        FileName: ''
+        FileName: '',
+        Remark: ''
       },
       countryprops: {
         value: 'adcode',
@@ -1384,6 +1385,8 @@ export default {
           console.log('345', this.scenefile)
           if (this.scenefile && this.scenefile.FileUrl && this.scenefile != null) {
             this.scenefileurllist = this.scenefile.FileUrl.split('$')
+            // this.scenefileurllist.push(this.scenefile.Remark)
+            console.log('222', this.scenefileurllist)
           }
         })
       }

src/dashoo.cn/frontend_web/src/pages/index.vue

@@ -316,7 +316,7 @@
 
           <el-row>
             <el-col :span="9" class="table-cell">{{this.formDataInvoice.SupplierName}}</el-col>
-            <el-col :span="10" class="table-cell">{{this.formDataInvoice.Address}}</el-col>
+            <el-col :span="10" class="table-cell">{{this.formDataInvoice.AllAddress}} {{this.formDataInvoice.Address}}</el-col>
             <el-col :span="5" class="table-cell">{{this.formDataInvoice.CommercialNo}}</el-col>
 
           </el-row>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/annualfistaudit.vue

@@ -54,7 +54,7 @@
             <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">企业法规处审批未通过</span>
             <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待交费</span>
             <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
-            <span v-if="scope.row.Status=='8'" style="color:#E6A23C">已入库</span>
+            <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>
             <span v-if="scope.row.Status=='11'" style="color:#67C23A">审核通过</span>
           </template>
         </el-table-column>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/basicindex.vue

@@ -78,7 +78,7 @@
               <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">企业法规处审批未通过</span>
               <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待交费</span>
               <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
-              <span v-if="scope.row.Status=='8'" style="color:#E6A23C">已入库</span>
+              <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>
               <span v-if="scope.row.Status=='11'" style="color:#67C23A">审核通过</span>
               <span v-if="scope.row.Status=='10'" style="color:#E6A23C">待分办</span>
               <span v-if="scope.row.Status=='-10'" style="color:#E6A23C">分办未通过</span>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/goodsindex.vue

@@ -78,7 +78,7 @@
               <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">企业法规处审批未通过</span>
               <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待交费</span>
               <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
-              <span v-if="scope.row.Status=='8'" style="color:#E6A23C">已入库</span>
+              <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>
               <span v-if="scope.row.Status=='11'" style="color:#67C23A">审核通过</span>
               <span v-if="scope.row.Status=='10'" style="color:#E6A23C">待分办</span>
               <span v-if="scope.row.Status=='-10'" style="color:#E6A23C">分办未通过</span>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/index.vue

@@ -75,7 +75,7 @@
               <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">企业法规处审批未通过</span>
               <span v-if="scope.row.Status=='6'" style="color:#F56C6C">待交费</span>
               <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
-              <span v-if="scope.row.Status=='8'" style="color:#E6A23C">已入库</span>
+              <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>
               <span v-if="scope.row.Status=='11'" style="color:#67C23A">审核通过</span>
               <span v-if="scope.row.Status=='10'" style="color:#E6A23C">待分办</span>
               <span v-if="scope.row.Status=='-10'" style="color:#E6A23C">分办未通过</span>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/techindex.vue

@@ -78,7 +78,7 @@
               <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">企业法规处审批未通过</span>
               <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待交费</span>
               <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
-              <span v-if="scope.row.Status=='8'" style="color:#E6A23C">已入库</span>
+              <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>
               <span v-if="scope.row.Status=='11'" style="color:#67C23A">审核通过</span>
               <span v-if="scope.row.Status=='10'" style="color:#E6A23C">待分办</span>
               <span v-if="scope.row.Status=='-10'" style="color:#E6A23C">分办未通过</span>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/paymentinfo/paymentsure.vue

@@ -34,7 +34,7 @@
         <el-row>
           <el-col :span="6" class="table-cell">{{this.formDataSup.SupplierName}}</el-col>
           <el-col :span="6" class="table-cell">{{this.formDataSup.CommercialNo}}</el-col>
-          <el-col :span="12" class="table-cell">{{this.formDataSup.Address}}</el-col>
+          <el-col :span="12" class="table-cell">{{this.formDataSup.AllAddress}} {{this.formDataSup.Address}}</el-col>
         </el-row>
         <el-row>
           <el-col :span="6" class="table-cell-title">开户银行</el-col>