说明改备注 增项提示 待办去掉集中评审

src/dashoo.cn/backend/api/controllers/oilsupplier/todolist.go

@@ -64,7 +64,7 @@ func (this *TodoListController) GetMyTaskEntityList() {
 		//工作流名称
 		has := false
 		wfName := strings.Split(item.ProcessDefinitionId, ":")[0] //如:oil_enuser_supplier_apply:2:2543
-		if wfName == workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY || wfName == workflow.OIL_ENUSER_SUPPLIER_APPLY || wfName == workflow.OIL_SECOND_ENUSER_SUPPLIER_APPLY || wfName == workflow.OIL_SUPPLIER_INSTORE {
+		if (item.TaskName != "集中评审") && (wfName == workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY || wfName == workflow.OIL_ENUSER_SUPPLIER_APPLY || wfName == workflow.OIL_SECOND_ENUSER_SUPPLIER_APPLY || wfName == workflow.OIL_SUPPLIER_INSTORE) {
 			//准入
 			where := " 1=1 "
 			where = where + " and b.Id = '" + id + "'"

src/dashoo.cn/frontend_web/src/components/error/401.vue

@@ -10,7 +10,7 @@
         <h1 class="text-jumbo text-ginormous">
           &nbsp;
         </h1>
-        <h2>准入申请通过后，才有访问权限</h2>
+        <h2 style="width: 465px">准入申请通过后，且处于准入状态的才有访问权限</h2>
       </el-col>
 
     </el-row>

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

@@ -8,30 +8,30 @@
         </span>
       </div>
       <el-table :data="auditbusList" border height="calc(100vh - 435px)" size="mini">
-        <el-table-column label="操作" width="90" align="center" fixed v-if="Visiblebtn != '10'">
-          <template slot-scope="scope">
-            <el-popover trigger="hover" width="700" placement="right" @show="getopinonList(scope.row)">
-              <el-table :data="opinionList">
-                <el-table-column width="80" property="AuditStatus" label="状态">
-                  <template slot-scope="scope">
-                    {{ transferStr(scope.row.AuditStatus+'') }}
-                  </template>
-                </el-table-column>
-                <el-table-column width="90" property="AuditorName" label="审批人"></el-table-column>
-                <el-table-column min-width="100" property="Opinion" label="审批意见"></el-table-column>
-                <el-table-column width="150" property="CreateOn" label="审批时间">
-                  <template slot-scope="scope">
-                    {{ jstimehandle(scope.row.CreateOn+'') }}
-                  </template>
-                </el-table-column>
-                <el-table-column width="120" property="Remark" label="备注信息"></el-table-column>
-              </el-table>
-              <div slot="reference" class="name-wrapper">
-                <el-button type="primary" plain size="mini" title="意见" @click="openDialog(scope.row)">意见</el-button>
-              </div>
-            </el-popover>
-          </template>
-        </el-table-column>
+        <!--<el-table-column label="操作" width="90" align="center" fixed v-if="Visiblebtn != '10'">-->
+          <!--<template slot-scope="scope">-->
+            <!--<el-popover trigger="hover" width="700" placement="right" @show="getopinonList(scope.row)">-->
+              <!--<el-table :data="opinionList">-->
+                <!--<el-table-column width="80" property="AuditStatus" label="状态">-->
+                  <!--<template slot-scope="scope">-->
+                    <!--{{ transferStr(scope.row.AuditStatus+'') }}-->
+                  <!--</template>-->
+                <!--</el-table-column>-->
+                <!--<el-table-column width="90" property="AuditorName" label="审批人"></el-table-column>-->
+                <!--<el-table-column min-width="100" property="Opinion" label="审批意见"></el-table-column>-->
+                <!--<el-table-column width="150" property="CreateOn" label="审批时间">-->
+                  <!--<template slot-scope="scope">-->
+                    <!--{{ jstimehandle(scope.row.CreateOn+'') }}-->
+                  <!--</template>-->
+                <!--</el-table-column>-->
+                <!--<el-table-column width="120" property="Remark" label="备注信息"></el-table-column>-->
+              <!--</el-table>-->
+              <!--<div slot="reference" class="name-wrapper">-->
+                <!--<el-button type="primary" plain size="mini" title="意见" @click="openDialog(scope.row)">意见</el-button>-->
+              <!--</div>-->
+            <!--</el-popover>-->
+          <!--</template>-->
+        <!--</el-table-column>-->
         <el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>
         <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
          <el-table-column prop="CertSubStatus" label="状态" show-overflow-tooltip>
@@ -328,9 +328,9 @@
       },
       transferStr (val) {
         if (val === '1') {
-          return '合格'
+          return '同意'
         } else if (val === '2') {
-          return '不合格'
+          return '不同意'
         } else {
           return '----'
         }

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

@@ -262,7 +262,7 @@
           </template>
         </el-form-item>
         <el-form-item label="意见" :rules="[{ required: true, message: '请输入审批意见', trigger: 'blur' }]">
-          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核意见"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/basisdataopera.vue

@@ -159,7 +159,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="意见">
-          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核意见"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
@@ -190,8 +190,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="shenheForm.AuditRemark" type="textarea" placeholder="请输入说明内容">
+            <el-form-item label="备注">
+              <el-input v-model="shenheForm.AuditRemark" type="textarea" placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/goodsdataopera.vue

@@ -164,7 +164,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="意见">
-          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核意见"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
@@ -195,8 +195,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="shenheForm.AuditRemark" type="textarea" placeholder="请输入说明内容">
+            <el-form-item label="备注">
+              <el-input v-model="shenheForm.AuditRemark" type="textarea" placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/techdataopera.vue

@@ -160,7 +160,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="意见">
-          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核意见"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
@@ -191,8 +191,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="shenheForm.AuditRemark" type="textarea" placeholder="请输入说明内容">
+            <el-form-item label="备注">
+              <el-input v-model="shenheForm.AuditRemark" type="textarea" placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/auditoperation.vue

@@ -260,8 +260,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="shenheForm.AuditorRemark" type="textarea" placeholder="请输入说明内容">
+            <el-form-item label="备注">
+              <el-input v-model="shenheForm.AuditorRemark" type="textarea" placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/bassicoperation.vue

@@ -235,8 +235,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
+            <el-form-item label="备注">
+              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>
@@ -274,8 +274,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
+            <el-form-item label="备注">
+              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/goodsoperation.vue

@@ -238,8 +238,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
+            <el-form-item label="备注">
+              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>
@@ -277,8 +277,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
+            <el-form-item label="备注">
+              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/operation.vue

@@ -239,8 +239,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
+            <el-form-item label="备注">
+              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>
@@ -278,8 +278,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
+            <el-form-item label="备注">
+              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>

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

@@ -182,8 +182,8 @@
             </el-form-item>
           </el-col> -->
             <el-col :span="24">
-              <el-form-item label="说明">
-                <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
+              <el-form-item label="备注">
+                <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入备注内容">
                 </el-input>
               </el-form-item>
             </el-col>

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

@@ -182,8 +182,8 @@
             </el-form-item>
           </el-col> -->
             <el-col :span="24">
-              <el-form-item label="说明">
-                <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
+              <el-form-item label="备注">
+                <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入备注内容">
                 </el-input>
               </el-form-item>
             </el-col>

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

@@ -182,8 +182,8 @@
             </el-form-item>
           </el-col> -->
             <el-col :span="24">
-              <el-form-item label="说明">
-                <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
+              <el-form-item label="备注">
+                <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入备注内容">
                 </el-input>
               </el-form-item>
             </el-col>

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

@@ -182,8 +182,8 @@
             </el-form-item>
           </el-col> -->
             <el-col :span="24">
-              <el-form-item label="说明">
-                <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
+              <el-form-item label="备注">
+                <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入备注内容">
                 </el-input>
               </el-form-item>
             </el-col>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochange/_opera/auditoperation.vue

@@ -50,7 +50,7 @@
               </template>
             </el-form-item>
             <el-form-item label="意见">
-              <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+              <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核意见"></el-input>
             </el-form-item>
           </el-col>
         </el-row>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochange/_opera/operation.vue

@@ -91,8 +91,8 @@
             </el-form-item> -->
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
+            <el-form-item label="备注">
+              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>

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

@@ -55,7 +55,7 @@
             <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待法规处审核</span>
             <span v-if="scope.row.Status=='-3'" style="color:#F56C6C">审核未通过</span>
             <span v-if="scope.row.Status=='3'" style="color:#67C23A">审核通过</span>
-          </template> 
+          </template>
         </el-table-column>
         <el-table-column prop="ConmmitTime" sortable min-width="100" label="申请日期" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -79,7 +79,7 @@
                 start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
           </el-col> -->
-          <!-- 
+          <!--
           <el-col :span="12">
             <el-form-item label="">
               <el-input size="mini" v-model="searchForm.Id" style="width:100%" placeholder="请输入"></el-input>
@@ -111,7 +111,7 @@
               <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-         
+
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -134,8 +134,8 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
+            <el-form-item label="备注">
+              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>
@@ -147,7 +147,7 @@
       </span>
       <br>
     </el-dialog>
-   
+
   </div>
 </template>
 <script>
@@ -253,7 +253,7 @@
           //   sort: true
           // },
 
-          
+
           // {
           //   prop: "MgrUnit",
           //   label: '管理单位',
@@ -377,7 +377,7 @@
             });
           }
         })
-        
+
       },
       getDictOptions() {
         api.getDictList(this.$axios).then(res => {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/auditoperation.vue

@@ -622,8 +622,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="shenheForm.AuditorRemark" type="textarea" placeholder="请输入说明内容"></el-input>
+            <el-form-item label="备注">
+              <el-input v-model="shenheForm.AuditorRemark" type="textarea" placeholder="请输入备注内容"></el-input>
             </el-form-item>
           </el-col>
         </el-row>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/operation.vue

@@ -660,8 +660,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容"></el-input>
+            <el-form-item label="备注">
+              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入备注内容"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -698,8 +698,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
+            <el-form-item label="备注">
+              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/operationbasic.vue

@@ -328,8 +328,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
+            <el-form-item label="备注">
+              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/operationgoods.vue

@@ -384,8 +384,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
+            <el-form-item label="备注">
+              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>

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

@@ -143,8 +143,8 @@
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item label="说明">
-                <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
+              <el-form-item label="备注">
+                <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入备注内容">
                 </el-input>
               </el-form-item>
             </el-col>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/qualchange/_opera/operation.vue

@@ -133,8 +133,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
+            <el-form-item label="备注">
+              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>

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

@@ -135,8 +135,8 @@
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item label="说明">
-                <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
+              <el-form-item label="备注">
+                <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入备注内容">
                 </el-input>
               </el-form-item>
             </el-col>

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

@@ -423,10 +423,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
+            <el-form-item label="备注">
               <el-input v-model="auditform.AuditRemark"
                         type="textarea"
-                        placeholder="请输入说明内容">
+                        placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>
@@ -470,10 +470,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
+            <el-form-item label="备注">
               <el-input v-model="auditform.AuditRemark"
                         type="textarea"
-                        placeholder="请输入说明内容">
+                        placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>

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

@@ -426,10 +426,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
+            <el-form-item label="备注">
               <el-input v-model="auditform.AuditRemark"
                         type="textarea"
-                        placeholder="请输入说明内容"></el-input>
+                        placeholder="请输入备注内容"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -472,10 +472,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
+            <el-form-item label="备注">
               <el-input v-model="auditform.AuditRemark"
                         type="textarea"
-                        placeholder="请输入说明内容">
+                        placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>

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

@@ -419,10 +419,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
+            <el-form-item label="备注">
               <el-input v-model="auditform.AuditRemark"
                         type="textarea"
-                        placeholder="请输入说明内容">
+                        placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>
@@ -466,10 +466,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
+            <el-form-item label="备注">
               <el-input v-model="auditform.AuditRemark"
                         type="textarea"
-                        placeholder="请输入说明内容">
+                        placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue

@@ -271,8 +271,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入说明内容">
+            <el-form-item label="备注">
+              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>
@@ -310,8 +310,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入说明内容">
+            <el-form-item label="备注">
+              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/goodsdataopera.vue

@@ -391,8 +391,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入说明内容">
+            <el-form-item label="备注">
+              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>
@@ -430,8 +430,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入说明内容">
+            <el-form-item label="备注">
+              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/techdataopera.vue

@@ -239,8 +239,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入说明内容">
+            <el-form-item label="备注">
+              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>
@@ -278,8 +278,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入说明内容">
+            <el-form-item label="备注">
+              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>

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

@@ -276,7 +276,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="意见">
-          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核意见"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
@@ -313,8 +313,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入说明内容">
+            <el-form-item label="备注">
+              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>

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

@@ -287,7 +287,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="意见">
-          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核意见"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
@@ -324,8 +324,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入说明内容">
+            <el-form-item label="备注">
+              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>

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

@@ -274,7 +274,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="意见">
-          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核意见"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
@@ -311,8 +311,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入说明内容">
+            <el-form-item label="备注">
+              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>

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

@@ -226,8 +226,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入说明内容">
+            <el-form-item label="备注">
+              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>

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

@@ -931,7 +931,7 @@
         }
         let myCreateOn = []
         // 解析时间
-        if (this.CreateOn.length == 2) {
+        if (this.CreateOn != null && this.CreateOn.length == 2) {
           this.CreateOn[1].setHours(23)
           this.CreateOn[1].setMinutes(59)
           this.CreateOn[1].setSeconds(59)

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

@@ -237,8 +237,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入说明内容">
+            <el-form-item label="备注">
+              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>

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

@@ -243,8 +243,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入说明内容">
+            <el-form-item label="备注">
+              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>

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

@@ -241,8 +241,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入说明内容">
+            <el-form-item label="备注">
+              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入备注内容">
               </el-input>
             </el-form-item>
           </el-col>