前端gjy

src/views/contractManagement/purchaseContract.vue

@@ -78,7 +78,12 @@
       :data="contractList.records"
       style="width: 100%; margin-top: 10px"
     >
-      <el-table-column type="index" label="序号" />
+      <el-table-column type="index" label="序号">
+        <template scope="scope">
+          <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+          <span v-else>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
       <el-table-column prop="contractNo" label="合同编号" width="80">
       </el-table-column>
       <el-table-column prop="goodsName" label="货名" width="80">
@@ -114,7 +119,18 @@
             @show="history(scope.row)"
           >
             <template>
-              <span slot="reference">{{ scope.row.status }}</span>
+              <span slot="reference">
+                <span
+                  v-if="scope.row.status == '待执行'"
+                  class="executory"
+                ></span>
+                <span
+                  v-if="scope.row.status == '执行中'"
+                  class="inExecution"
+                ></span>
+                <span v-if="scope.row.status == '已完成'" class="done"></span
+                >{{ scope.row.status }}
+              </span>
             </template>
             <div>
               <p>操作历史</p>
@@ -132,7 +148,15 @@
               </div>
             </div>
           </el-popover>
-          <i class="el-icon-edit" @click="editClick(scope.row)"></i>
+          <img
+            width="17"
+            height="18"
+            style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/edit.png"
+            @click="editClick(scope.row)"
+            alt=""
+          />
+          <!-- <i class="el-icon-edit" @click="editClick(scope.row)"></i> -->
         </template>
       </el-table-column>
       <el-table-column prop="signingDate" label="签订日期"> </el-table-column>
@@ -140,7 +164,15 @@
       </el-table-column>
       <el-table-column prop="addressUrl" label="附件">
         <template slot-scope="scope">
-          <i @click="fujian(scope.row)" class="el-icon-paperclip iconCss"></i>
+          <img
+            width="18"
+            height="20"
+            style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/fujian.png"
+            @click="fujian(scope.row)"
+            alt=""
+          />
+          <!-- <i @click="fujian(scope.row)" class="el-icon-paperclip iconCss"></i> -->
         </template>
       </el-table-column>
       <el-table-column prop="address" label="操作" width="300">
@@ -455,6 +487,25 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.executory,
+.inExecution,
+.done {
+  width: 6px;
+  height: 6px;
+  display: inline-block;
+  border-radius: 50%;
+  position: relative;
+  top: -1px;
+}
+.executory {
+  background: #ff9f24;
+}
+.inExecution {
+  background: #5878e8;
+}
+.done {
+  background: #50cad4;
+}
 .top-grade {
   background: linear-gradient(90deg, #5678e9, #7993f6);
   color: #fff;

src/views/contractManagement/purchaseContractAdd.vue

@@ -4,7 +4,7 @@
   <div class="container">
     <el-row>
       <el-col :span="12">
-        <h2 class="bg-left">创建销售合同</h2>
+        <h2 class="bg-left">创建采购合同</h2>
       </el-col>
       <el-col :span="12" class="bg-right">
         <el-button
@@ -235,185 +235,183 @@
           />
         </ws-form-item>
       </ws-info-table>
-      <base-card>
-        <!--面试信息-->
-        <div class="remark">
-          <h3>货物信息</h3>
-        </div>
-        <ws-info-table>
-          <ws-form-item label="货名" span="1" prop="goodsName">
-            <ws-select
-              v-model="deptBudgetList.contractGoodsInfo.goodsName"
-              placeholder=""
-              class="typeselect"
-              @change="selectgoodsName"
-            >
-              <ws-option
-                v-for="item in goodnameList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              />
-            </ws-select>
-          </ws-form-item>
-          <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
-            <ws-input
-              v-model="deptBudgetList.contractGoodsInfo.waterContent"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item label="品级" span="1" prop="grade">
-            <ws-select
-              v-model="deptBudgetList.contractGoodsInfo.grade"
-              placeholder=""
-              class="typeselect"
-              @change="selectgrade"
-            >
-              <ws-option
-                v-for="item in gradeList"
-                :key="item.constValue"
-                :label="item.constValue"
-                :value="item.constValue"
-              />
-            </ws-select>
-          </ws-form-item>
-          <ws-form-item label="杂质（%）<=" span="1" prop="interviewDates">
-            <ws-input
-              v-model="deptBudgetList.contractGoodsInfo.impurity"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item label="容重（克/升）<=" span="1" prop="interviewType">
-            <ws-input
-              v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item
-            label="霉变粒（%）<="
-            span="1"
-            prop="mildewGrain"
-            class="result"
+      <!--面试信息-->
+      <div class="remark">
+        <h3>货物信息</h3>
+      </div>
+      <ws-info-table>
+        <ws-form-item label="货名" span="1" prop="goodsName">
+          <ws-select
+            v-model="deptBudgetList.contractGoodsInfo.goodsName"
+            placeholder=""
+            class="typeselect"
+            @change="selectgoodsName"
           >
-            <ws-input
-              v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
-            <ws-input
-              v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
-              maxlength="100"
-              size="small"
+            <ws-option
+              v-for="item in goodnameList"
+              :key="item.constKey"
+              :label="item.constValue"
+              :value="item.constValue"
             />
-          </ws-form-item>
-          <ws-form-item
-            label="不完善粒（%）<="
-            span="1"
-            prop="imperfectGrain"
-            class="result"
+          </ws-select>
+        </ws-form-item>
+        <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
+          <ws-input
+            v-model="deptBudgetList.contractGoodsInfo.waterContent"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+        <ws-form-item label="品级" span="1" prop="grade">
+          <ws-select
+            v-model="deptBudgetList.contractGoodsInfo.grade"
+            placeholder=""
+            class="typeselect"
+            @change="selectgrade"
           >
-            <ws-input
-              v-model="deptBudgetList.contractGoodsInfo.imperfectGrain"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-        </ws-info-table>
-        <div class="remark">
-          <h3>流程信息</h3>
-        </div>
-        <ws-info-table>
-          <ws-form-item label="合同收入（元）" span="1" prop="goodsNameKey">
-            <ws-input
-              v-model="deptBudgetList.contractProcessInfo.goodsNameKey"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item label="已开发票（元）" span="1" prop="goodsName">
-            <ws-input
-              v-model="deptBudgetList.contractProcessInfo.goodsName"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item label="费用支出（元）" span="1" prop="waterContent">
-            <ws-input
-              v-model="deptBudgetList.contractProcessInfo.waterContent"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item label="未开发票（元）" span="1" prop="impurity">
-            <ws-input
-              v-model="deptBudgetList.contractProcessInfo.impurity"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item label="未回款（元）" span="1" prop="mildewGrain">
-            <ws-input
-              v-model="deptBudgetList.contractProcessInfo.mildewGrain"
-              maxlength="100"
-              size="small"
+            <ws-option
+              v-for="item in gradeList"
+              :key="item.constValue"
+              :label="item.constValue"
+              :value="item.constValue"
             />
-          </ws-form-item>
-          <ws-form-item
-            label="已完成发运量（吨）"
-            span="1"
-            prop="Prettier"
-            class="imperfectGrain"
+          </ws-select>
+        </ws-form-item>
+        <ws-form-item label="杂质（%）<=" span="1" prop="interviewDates">
+          <ws-input
+            v-model="deptBudgetList.contractGoodsInfo.impurity"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+        <ws-form-item label="容重（克/升）<=" span="1" prop="interviewType">
+          <ws-input
+            v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+        <ws-form-item
+          label="霉变粒（%）<="
+          span="1"
+          prop="mildewGrain"
+          class="result"
+        >
+          <ws-input
+            v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+        <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
+          <ws-input
+            v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+        <ws-form-item
+          label="不完善粒（%）<="
+          span="1"
+          prop="imperfectGrain"
+          class="result"
+        >
+          <ws-input
+            v-model="deptBudgetList.contractGoodsInfo.imperfectGrain"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+      </ws-info-table>
+      <div class="remark">
+        <h3>流程信息</h3>
+      </div>
+      <ws-info-table>
+        <ws-form-item label="合同收入（元）" span="1" prop="goodsNameKey">
+          <ws-input
+            v-model="deptBudgetList.contractProcessInfo.goodsNameKey"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+        <ws-form-item label="已开发票（元）" span="1" prop="goodsName">
+          <ws-input
+            v-model="deptBudgetList.contractProcessInfo.goodsName"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+        <ws-form-item label="费用支出（元）" span="1" prop="waterContent">
+          <ws-input
+            v-model="deptBudgetList.contractProcessInfo.waterContent"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+        <ws-form-item label="未开发票（元）" span="1" prop="impurity">
+          <ws-input
+            v-model="deptBudgetList.contractProcessInfo.impurity"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+        <ws-form-item label="未回款（元）" span="1" prop="mildewGrain">
+          <ws-input
+            v-model="deptBudgetList.contractProcessInfo.mildewGrain"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+        <ws-form-item
+          label="已完成发运量（吨）"
+          span="1"
+          prop="Prettier"
+          class="imperfectGrain"
+        >
+          <ws-input
+            v-model="deptBudgetList.contractProcessInfo.imperfectGrain"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+        <ws-form-item label="双章原件回收情况" span="1" prop="grade">
+          <ws-select
+            v-model="deptBudgetList.contractProcessInfo.grade"
+            placeholder=""
+            class="typeselect"
+            @change="selectChapterTwo"
           >
-            <ws-input
-              v-model="deptBudgetList.contractProcessInfo.imperfectGrain"
-              maxlength="100"
-              size="small"
+            <ws-option
+              v-for="item in ChapterTwoList"
+              :key="item.constValue"
+              :label="item.constValue"
+              :value="item.constValue"
             />
-          </ws-form-item>
-          <ws-form-item label="双章原件回收情况" span="1" prop="grade">
-            <ws-select
-              v-model="deptBudgetList.contractProcessInfo.grade"
-              placeholder=""
-              class="typeselect"
-              @change="selectChapterTwo"
-            >
-              <ws-option
-                v-for="item in ChapterTwoList"
-                :key="item.constValue"
-                :label="item.constValue"
-                :value="item.constValue"
-              />
-            </ws-select>
-          </ws-form-item>
-        </ws-info-table>
-        <div class="remark">
-          <h3>备注信息</h3>
-        </div>
-        <ws-input
-          v-model="deptBudgetList.remarks"
-          type="textarea"
-          row="3"
-          placeholder="请输入备注信息，不超过200字"
-          maxlength="200"
-        />
-        <ws-upload
-          ref="upload"
-          table-name="maintain_work_order"
-          oss-key="mainPlan"
-          :comp-id="compId"
-          :appendix-ids="appendixIdsAdd"
-          :vesselId="deptBudgetList.addressUrl"
-          :size-limit="size"
-          @uploadSuccess="uploadSuccess"
-          @onChange="onChange"
-          accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
-        />
-      </base-card>
+          </ws-select>
+        </ws-form-item>
+      </ws-info-table>
+      <div class="remark">
+        <h3>备注信息</h3>
+      </div>
+      <ws-input
+        v-model="deptBudgetList.remarks"
+        type="textarea"
+        row="3"
+        placeholder="请输入备注信息，不超过200字"
+        maxlength="200"
+      />
+      <ws-upload
+        ref="upload"
+        table-name="maintain_work_order"
+        oss-key="mainPlan"
+        :comp-id="compId"
+        :appendix-ids="appendixIdsAdd"
+        :vesselId="deptBudgetList.addressUrl"
+        :size-limit="size"
+        @uploadSuccess="uploadSuccess"
+        @onChange="onChange"
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
+      />
     </ws-form>
     <div style="text-align: right; padding: 10px">
       <el-button class="bg-bottom" type="primary" size="small" @click="submit()"
@@ -435,7 +433,7 @@ import {
 import WsUpload from '@/components/WsUpload'
 export default {
   name: 'viewSpareMoney',
-   components: {
+  components: {
     WsUpload,
   },
   watch: {
@@ -449,7 +447,7 @@ export default {
       this.loaddata()
     },
   },
- 
+
   data() {
     return {
       //弹出框
@@ -719,6 +717,10 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 140px;
+  text-align: center;
+}
 .ws-upload {
   margin-top: 20px;
 }

src/views/contractManagement/purchaseContractEdit.vue

@@ -671,6 +671,10 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 140px;
+  text-align: center;
+}
 .el-form {
   padding: 0 20%;
 }

src/views/contractManagement/purchaseContractExamine.vue

@@ -298,6 +298,10 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 140px;
+  text-align: center;
+}
 .el-form {
   padding: 0 20%;
 }

src/views/contractManagement/salesContractAdd.vue

@@ -521,9 +521,8 @@ import WsUpload from '@/components/WsUpload'
 
 export default {
   name: 'viewSpareMoney',
-  components:{
-  WsUpload,
-
+  components: {
+    WsUpload,
   },
   watch: {
     vesselId(val) {
@@ -731,7 +730,7 @@ export default {
     //   let key = this.unitList.find((item) => item.constValue === val).constKey
     //   this.pleaseChoose = val
     // },
-   
+
     handleExamine() {},
     approve() {},
     // returnsales() {
@@ -809,6 +808,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 140px;
+  text-align: center;
+}
 .button-container {
   display: flex;
   flex-wrap: nowrap;

src/views/contractManagement/salesContractEdit.vue

@@ -37,8 +37,7 @@
               maxlength="100"
               size="small"
             /> -->
-            {{deptBudgetList.contractNo}}
-            
+            {{ deptBudgetList.contractNo }}
           </ws-form-item>
 
           <!--运输方式-->
@@ -52,9 +51,7 @@
 
           <!--买方-->
           <ws-form-item label="买方" span="1" prop="contractNo">
-            
-            {{deptBudgetList.buyer}}
-            
+            {{ deptBudgetList.buyer }}
           </ws-form-item>
 
           <!--结算方式-->
@@ -68,9 +65,7 @@
 
           <!--卖方-->
           <ws-form-item label="卖方" span="1" prop="contractNo">
-           
-            {{deptBudgetList.seller}}
-          
+            {{ deptBudgetList.seller }}
           </ws-form-item>
 
           <!--货源地-->
@@ -297,8 +292,7 @@
                   :value="item.constValue"
                 />
               </ws-select> -->
-              {{deptBudgetList.contractGoodsInfo.goodsName}}
-              
+              {{ deptBudgetList.contractGoodsInfo.goodsName }}
             </ws-form-item>
 
             <!--水分（%）<=-->
@@ -503,10 +497,15 @@
 <script>
 // import { getVesselOne } from '@/model/procurement/basic'
 // import { dayjs } from 'base-core-lib'
-import { examineList, editInfo, packList , xiala,
+import {
+  examineList,
+  editInfo,
+  packList,
+  xiala,
   addxiala,
   editxiala,
-  delxiala,} from '@/model/contarct/index'
+  delxiala,
+} from '@/model/contarct/index'
 export default {
   name: 'viewSpareMoney',
   watch: {
@@ -534,25 +533,25 @@ export default {
       submitType: true,
       tableData: [{ date: 1111, name: 'qqqq', address: 'errrtt' }],
       pickerBeginDateBefore: {
-         disabledDate: (time) => {
+        disabledDate: (time) => {
           return time.getTime() > Date.now()
         },
       },
       // selectpackingMethod:{},
-     selectunitList: {},
+      selectunitList: {},
       //change:{},
-      onChange:{},
-      uploadSuccess:{},
-      selectgrade:{},
+      onChange: {},
+      uploadSuccess: {},
+      selectgrade: {},
       goodnameList: {},
-     selectpackingMethod:{},
+      selectpackingMethod: {},
       unitList: {},
       packtypeList: [],
       compId: sessionStorage.getItem('ws-pf_compId'),
       appendixIdsAdd: '',
       size: 10,
       deptBudgetList: {
-         contractGoodsInfo: {
+        contractGoodsInfo: {
           goodsName: '',
         },
         contractProcessInfo: {},
@@ -566,8 +565,8 @@ export default {
       dutyList: {},
       sexList: {},
       selectDuty: {},
-gradeList:{},
-ChapterTwoList:{},
+      gradeList: {},
+      ChapterTwoList: {},
       selectIntendedShip: {},
       interviewTypeList: {},
     }
@@ -579,7 +578,7 @@ ChapterTwoList:{},
     this.loaddata()
     this.editInfo()
     this.showType = this.isShow
-  // console.log(this.$route.params)
+    // console.log(this.$route.params)
     this.showType = this.isShow
   },
   methods: {
@@ -624,8 +623,8 @@ ChapterTwoList:{},
           this.ChapterTwoList = response
         })
     },
-    
-     getUnitList() {
+
+    getUnitList() {
       xiala({
         compId: sessionStorage.getItem('ws-pf_compId'),
         constCode: 'TYPEYAN',
@@ -676,8 +675,8 @@ ChapterTwoList:{},
           this.pleaseChoose = ''
         })
     },
-     saveClick(item, index) {
-    //  console.log(item)
+    saveClick(item, index) {
+      //  console.log(item)
 
       if (Object.is(item.id, 1)) {
         return
@@ -716,12 +715,12 @@ ChapterTwoList:{},
           })
       }
     },
-    submit() { 
+    submit() {
       this.$refs.deptBudgetList.validate((valid) => {
         if (valid) {
           this.deptBudgetList.compId = this.compId
           this.deptBudgetList.contractType = 1
-         editInfo(this.deptBudgetList)
+          editInfo(this.deptBudgetList)
             .toPromise()
             .then((response) => {
               this.$message.success('添加成功')
@@ -738,11 +737,14 @@ ChapterTwoList:{},
     },
     // getList(){}
   },
-  
 }
 </script>
 
 <style lang="scss" scoped>
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 140px;
+  text-align: center;
+}
 .button-container {
   display: flex;
   flex-wrap: nowrap;

src/views/contractManagement/salesContractExamine.vue

@@ -306,6 +306,10 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 140px;
+  text-align: center;
+}
 .el-form {
   padding: 0 20%;
 }