增项增加修改

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

@@ -381,6 +381,7 @@
             }
             if (_this.IsCompanyUser == 1 && _this.supplierList) {
               _this.entityForm.SupplierId = _this.supplierList[0].Id
+              _this.entityForm.SupplierName = _this.supplierList[0].SupplierName
             }
           })
           .catch(err => {

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

@@ -383,6 +383,7 @@
             }
             if (_this.IsCompanyUser == 1 && _this.supplierList) {
               _this.entityForm.SupplierId = _this.supplierList[0].Id
+              _this.entityForm.SupplierName = _this.supplierList[0].SupplierName
             }
           })
           .catch(err => {

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

@@ -381,6 +381,7 @@
             }
             if (_this.IsCompanyUser == 1 && _this.supplierList) {
               _this.entityForm.SupplierId = _this.supplierList[0].Id
+              _this.entityForm.SupplierName = _this.supplierList[0].SupplierName
             }
           })
           .catch(err => {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/basisedit.vue

@@ -558,6 +558,7 @@
           Id: '',
           Step: 1,
           Status: '',
+          SupplierName: '',
           SupplierId: 0,
           SupplierCertId: 0,
           RecUnitFlag: '', //推荐单位的级联Id标记
@@ -645,6 +646,7 @@
       },
       qppend() {
         let _this = this
+        _this.appendformData.SupplierName = this.formData.SupplierName
         _this.appendformData.SupplierId = parseInt(this.serviceId)
         _this.appendformData.SupplierCertId = parseInt(this.certId)
         _this.appendformData.AppendType = '02'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/goodsedit.vue

@@ -562,6 +562,7 @@
           Id: '',
           Step: 1,
           Status: '',
+          SupplierName: '',
           SupplierId: 0,
           SupplierCertId: 0,
           RecUnitFlag: '', //推荐单位的级联Id标记
@@ -652,6 +653,7 @@
       },
       qppend() {
         let _this = this
+        _this.appendformData.SupplierName = this.formData.SupplierName
         _this.appendformData.SupplierId = parseInt(this.serviceId)
         _this.appendformData.SupplierCertId = parseInt(this.certId)
         _this.appendformData.AppendType = '01'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/techedit.vue

@@ -553,6 +553,7 @@
           Id: '',
           Step: 1,
           Status: '',
+          SupplierName: '',
           SupplierId: 0,
           SupplierCertId: 0,
           RecUnitFlag: '', //推荐单位的级联Id标记
@@ -638,6 +639,7 @@
       },
       qppend() {
         let _this = this
+        _this.appendformData.SupplierName = this.formData.SupplierName
         _this.appendformData.SupplierId = parseInt(this.serviceId)
         _this.appendformData.SupplierCertId = parseInt(this.certId)
         _this.appendformData.AppendType = '03'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/basislist.vue

@@ -52,11 +52,7 @@
               <!-- <el-button type="primary" title="删除" size="mini" plain @click="deleteData(scope.row.Id)">删除</el-button> -->
             </template>
           </el-table-column>
-          <el-table-column prop="ApplyDate" label="申请日期" sortable min-width="130" align="center" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ jstimehandle(scope.row.ApplyDate) }}
-            </template>
-          </el-table-column>
+          
           <el-table-column prop="SupplierName" label="供方名称" sortable min-width="130" align="center"
             show-overflow-tooltip></el-table-column>
           <!-- <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column> -->
@@ -67,6 +63,11 @@
           </el-table-column>
           <!-- <el-table-column prop="DenyReason" label="退回原因" sortable min-width="130" align="center" show-overflow-tooltip>
         </el-table-column> -->
+        <el-table-column prop="ApplyDate" label="申请日期" sortable min-width="130" align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ jstimehandle(scope.row.ApplyDate) }}
+            </template>
+          </el-table-column>
           <el-table-column prop="AuditDate" label="审核日期" sortable min-width="130" align="center" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ jstimehandle(scope.row.AuditDate) }}
@@ -245,6 +246,7 @@
           Id: '',
           Step: 1,
           Status: '',
+          SupplierName: '',
           SupplierId: 0,
           SupplierCertId: 0,
           RecUnitFlag: '', //推荐单位的级联Id标记
@@ -334,6 +336,7 @@
               _this.suplen = _this.supplierList.length
               _this.appendformData.SupplierId = _this.supplierList[0].SupplierId
               _this.appendformData.SupplierCertId = _this.supplierList[0].SupplierCertId
+              _this.appendformData.SupplierName = _this.supplierList[0].SupplierName
             }
           })
           .catch(err => {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/goodslist.vue

@@ -50,11 +50,7 @@
               <!-- <el-button type="primary" title="删除" size="mini" plain @click="deleteData(scope.row.Id)">删除</el-button> -->
             </template>
           </el-table-column>
-          <el-table-column prop="ApplyDate" label="申请日期" sortable min-width="130" align="center" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ jstimehandle(scope.row.ApplyDate) }}
-            </template>
-          </el-table-column>
+          
           <el-table-column prop="SupplierName" label="供方名称" sortable min-width="130" align="center"
                            show-overflow-tooltip></el-table-column>
           <!-- <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column> -->
@@ -65,6 +61,11 @@
           </el-table-column>
           <!-- <el-table-column prop="DenyReason" label="退回原因" sortable min-width="130" align="center" show-overflow-tooltip>
           </el-table-column> -->
+          <el-table-column prop="ApplyDate" label="申请日期" sortable min-width="130" align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ jstimehandle(scope.row.ApplyDate) }}
+            </template>
+          </el-table-column>
           <el-table-column prop="AuditDate" label="审核日期" sortable min-width="130" align="center" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ jstimehandle(scope.row.AuditDate) }}
@@ -245,6 +246,7 @@
           Id: '',
           Step: 1,
           Status: '',
+          SupplierName: '',
           SupplierId: 0,
           SupplierCertId: 0,
           RecUnitFlag: '', //推荐单位的级联Id标记
@@ -334,6 +336,7 @@
               _this.suplen = _this.supplierList.length
               _this.appendformData.SupplierId = _this.supplierList[0].SupplierId
               _this.appendformData.SupplierCertId = _this.supplierList[0].SupplierCertId
+              _this.appendformData.SupplierName = _this.supplierList[0].SupplierName
             }
           })
           .catch(err => {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/techlist.vue

@@ -54,11 +54,7 @@
               <!-- <el-button type="primary" title="删除" size="mini" plain @click="deleteData(scope.row.Id)">删除</el-button> -->
             </template>
           </el-table-column>
-          <el-table-column prop="ApplyDate" label="申请日期" sortable min-width="130" align="center" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ jstimehandle(scope.row.ApplyDate) }}
-            </template>
-          </el-table-column>
+          
           <el-table-column prop="SupplierName" label="供方名称" sortable min-width="130" align="center"
             show-overflow-tooltip></el-table-column>
           <!-- <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column> -->
@@ -69,6 +65,11 @@
           </el-table-column>
           <!-- <el-table-column prop="DenyReason" label="退回原因" sortable min-width="130" align="center" show-overflow-tooltip>
         </el-table-column> -->
+        <el-table-column prop="ApplyDate" label="申请日期" sortable min-width="130" align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ jstimehandle(scope.row.ApplyDate) }}
+            </template>
+          </el-table-column>
           <el-table-column prop="AuditDate" label="审核日期" sortable min-width="130" align="center" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ jstimehandle(scope.row.AuditDate) }}
@@ -248,6 +249,7 @@
           Id: '',
           Step: 1,
           Status: '',
+          SupplierName: '',
           SupplierId: 0,
           SupplierCertId: 0,
           RecUnitFlag: '', //推荐单位的级联Id标记
@@ -338,6 +340,7 @@
               _this.suplen = _this.supplierList.length
               _this.appendformData.SupplierId = _this.supplierList[0].SupplierId
               _this.appendformData.SupplierCertId = _this.supplierList[0].SupplierCertId
+              _this.appendformData.SupplierName = _this.supplierList[0].SupplierName
             }
           })
           .catch(err => {