准入标识 暂停取消

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

@@ -1019,4 +1019,29 @@ func (this *OilSupplierCertController) CreateAccessCardNo() {
 	codecSvc.UpdateEntityByIdCols(Id, &entity, cols)
 	this.Data["json"] = seqStr
 	this.ServeJSON()
+}
+
+// @Title 修改准入标识
+// @Description 修改准入标识
+// @Success 200 {object} controllers.Request
+// @router /updatainflag/ [get]
+func (this *OilSupplierCertController) UpdataInFlag() {
+	var certentitys []suppliercert.OilSupplierCert
+	svc := suppliercert.GetOilSupplierCertService(utils.DBE)
+	svc.GetEntities(&certentitys, "")
+	for i := 0; i < len(certentitys); i++ {
+		if time.Now().Format("2006-01-02") == certentitys[i].ApplyTime.Format("2006-01-02") {
+			var certentity suppliercert.OilSupplierCert
+			certentity.InFlag = "2"
+			cols := []string{"InFlag"}
+			svc.UpdateEntityByIdCols(certentitys[i].Id, &certentity, cols)
+		}
+		if certentitys[i].ApplyTime.AddDate(1, 0, 0).Format("2006-01-02") == time.Now().Format("2006-01-02") {
+			fmt.Println(certentitys[i].ApplyTime.AddDate(1, 0, 0).Format("2006-01-02"), time.Now().Format("2006-01-02"))
+			var certentity suppliercert.OilSupplierCert
+			certentity.InFlag = "3"
+			cols := []string{"InFlag"}
+			svc.UpdateEntityByIdCols(certentitys[i].Id, &certentity, cols)
+		}
+	}
 }

src/dashoo.cn/frontend_web/src/api/oilsupplier/suppliercert.js

@@ -91,5 +91,11 @@ export default {
       url: '/suppliercert/createaccesscardno/' + type + '?Id=' + Id,
       method: 'GET'
     })
-  }
+  },
+  updataInFlag (myAxios) {
+    return myAxios({
+      url: '/suppliercert/updatainflag/',
+      method: 'GET'
+    })
+  },
 }

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

@@ -1,6 +1,8 @@
 
 <template>
   <div>
+    <!--startprint1-->
+    <!--打印内容开始-->
     <el-form label-width="135px" ref="EntityForm" :model="formData" :rules="rulesform" :disabled="disabled">
       <el-row>
         <!--<el-col :span="8">
@@ -321,7 +323,7 @@
             <el-input v-model="formData.CompanyUrl" placeholder="请输入" style="width: 100%"></el-input>
           </el-form-item>
         </el-col>-->
-<el-col :span="8">
+        <el-col :span="8">
           <el-form-item label="级别" >
             <el-input v-model="formData.Level" maxlength="255" placeholder="请输入" style="width: 100%">
             </el-input>
@@ -341,6 +343,7 @@
 
       </el-row>
     </el-form>
+
     <el-form label-position="top" ref="EntityFormCert" :rules="rulesform" :model="formData" :disabled="disabled">
       <el-row :gutter="60">
         <el-col :span="8">
@@ -416,6 +419,8 @@
       </el-row>
 
     </el-form>
+    <!--打印内容结束-->
+    <!--endprint1-->
   </div>
 </template>
 

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

@@ -24,7 +24,7 @@
             </el-steps>
             <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button>
           </el-popover>
-          <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="confirm">确认入库</el-button>
+          <!--<el-button type="primary" size="mini" style="margin-right: 5px" @click="printbtn">打印</el-button>-->
           <router-link :to="'/oilsupplier/supplierstore/goodslist'">
             <el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回
             </el-button>
@@ -212,40 +212,16 @@
         </el-tab-pane>
       </el-tabs>
     </el-card>
-   <el-dialog title="提交初审" :visible.sync="dialogVisible" width="520px">
-      <el-form ref="searchForm" label-width="70px">
-        <el-row>
-          <!--<el-col :span="24">
-            <el-form-item label="二级单位">
-              <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
-                filterable style="width: 100%" @change="auditOrgChang" v-model="secOrganize" placeholder="请选择组织">
-              </el-cascader>
-            </el-form-item>
-          </el-col>-->
-          <el-col :span="24">
-            <el-form-item label="审批人">
-              <!--<el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 90%" filterable
-                allow-create default-first-option>
-                <el-option v-for="item in auditerOption" :key="item.id" :label="item.realname" :value="item.id">
-                </el-option>
-              </el-select>-->
-              <el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择审批人">
-                <el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow"></el-button>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入说明内容">
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
-        <el-button size="mini" type="primary" @click="AuditEntity">确定</el-button>
-      </span>
+   <el-dialog title="打印内容" :visible.sync="dialogVisible" width="1024px">
+       <el-card class="box-card">
+         <div slot="header" class="clearfix">
+           <span>供方基本信息表</span>
+           <el-button style="float: right; padding: 3px 0" type="text" @click="printinfo('1')">操作按钮</el-button>
+         </div>
+         <goods-info ref="GoodsInfo" :formData.sync="formData" :dictData.sync="dictData" :authUser="authUser"
+                     :canUpdateSupplier="canUpdateSupplier" @selectcompany="changeFormData" @inputcompany="inputCompany">
+         </goods-info>
+       </el-card>
     </el-dialog>
 
     <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
@@ -477,6 +453,28 @@
       }
     },
     methods: {
+      printbtn () {
+        this.dialogVisible = true
+      },
+      printinfo (oper) {
+        if (oper < 10) {
+          let bdhtml = window.document.body.innerHTML // 获取当前页的html代码
+          console.log(bdhtml)
+          let sprnstr = '<!--startprint' + oper + '-->' // 设置打印开始区域
+          let eprnstr = '<!--endprint' + oper + '-->' // 设置打印结束区域
+          let prnhtml = bdhtml.substring(bdhtml.indexOf(sprnstr) + 18) // 从开始代码向后取html
+          prnhtml = prnhtml.substring(0, prnhtml.indexOf(eprnstr)) // 从结束代码向前取html
+          console.log(prnhtml, 'prnhtml')
+          window.document.body.innerHTML = prnhtml
+          window.print()
+          window.document.body.innerHTML = bdhtml
+        } else {
+          window.print()
+        }
+      },
+      // printinfo () {
+      //   window.print()
+      // },
       confirm () {
         this.$confirm('确认提交入库','提示',{
           confirmButtonText: '确认',

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

@@ -29,7 +29,7 @@
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" min-width="150" align="center" fixed="right">
           <template slot-scope="scope">
-            <router-link :to="'/oilsupplier/supplierstorage/' + scope.row.Id + '/basisedit?certid=' + scope.row.CertId">
+            <router-link :to="'/oilsupplier/supplierstore/' + scope.row.Id + '/basisedit?certid=' + scope.row.CertId">
               <el-button type="primary" plain title="编辑" size="mini">打开</el-button>
             </router-link>
 
@@ -48,7 +48,19 @@
             </el-popover>
           </template>
         </el-table-column>
-
+        <el-table-column min-width="110" align="center" prop="InFlag" label="准入标识" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-alert v-if="scope.row.InFlag=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="准入" type="success">
+            </el-alert>
+            <el-alert v-if="scope.row.InFlag=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="暂停" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.InFlag=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="取消" type="error">
+            </el-alert>
+          </template>
+        </el-table-column>
         <el-table-column v-for="column in tableColumns" :key="column.Id"
                          v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable :width="column.width" :label="column.label" align="center" show-overflow-tooltip></el-table-column>
 

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

@@ -29,7 +29,7 @@
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" min-width="150" align="center" fixed="right">
           <template slot-scope="scope">
-            <router-link :to="'/oilsupplier/supplierstorage/' + scope.row.Id + '/goodsedit?certid=' + scope.row.CertId">
+            <router-link :to="'/oilsupplier/supplierstore/' + scope.row.Id + '/goodsedit?certid=' + scope.row.CertId">
               <el-button type="primary" plain title="编辑" size="mini">打开</el-button>
             </router-link>
 

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

@@ -29,7 +29,7 @@
       <el-table :data="entityList" border height="calc(100vh - 246px)" style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" min-width="150" align="center" fixed="right">
           <template slot-scope="scope">
-            <router-link :to="'/oilsupplier/supplierstorage/' + scope.row.Id + '/techedit?certid=' + scope.row.CertId">
+            <router-link :to="'/oilsupplier/supplierstore/' + scope.row.Id + '/techedit?certid=' + scope.row.CertId">
               <el-button type="primary" plain title="详细信息" size="mini">打开</el-button>
             </router-link>
 
@@ -48,7 +48,19 @@
             </el-popover>
           </template>
         </el-table-column>
-
+        <el-table-column min-width="110" align="center" prop="InFlag" label="准入标识" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-alert v-if="scope.row.InFlag=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="准入" type="success">
+            </el-alert>
+            <el-alert v-if="scope.row.InFlag=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="暂停" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.InFlag=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="取消" type="error">
+            </el-alert>
+          </template>
+        </el-table-column>
         <el-table-column v-for="column in tableColumns" :key="column.Id"
                          v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable :width="column.width" :label="column.label" align="center" show-overflow-tooltip></el-table-column>