cz пре 1 година
родитељ
комит
3989e98b3e

+ 34 - 3
src/views/JXSK/salesMange/contract/index.vue

@@ -42,6 +42,26 @@
             </el-tooltip>
           </div>
         </template>
+
+        <template #production="{item}">
+          <div style="width: 100%;display:flex;">
+
+            <div v-for="(circle,index) in item.contractDetailsList " :key="circle.id" style="margin-right:20px">
+              <el-tooltip placement="bottom" effect="dark">
+                <div>
+                  <el-progress type="circle" :percentage="(Number(circle.completionRate))" width="60"
+                               :status="(Number(circle.completionRate)) == 100 ? 'success' : ''" />
+                </div>
+                <template #content>
+                  <div>
+                    {{ circle.productName }}({{circle.productSpec}})
+                  </div>
+                </template>
+              </el-tooltip>
+            </div>
+
+          </div>
+        </template>
       </byTable>
     </div>
     <el-dialog :title="modalType == 'add' ? '添加合同' : '查看合同'" v-model="dialogVisible" width="80%" v-loading="loading" destroy-on-close>
@@ -337,11 +357,18 @@ const config = computed(() => {
       //   return proxy.dictValueLabel(type, isSettled.value);
       // },
     },
+    // {
+    //   attrs: {
+    //     label: "备注",
+    //     slot: "remark",
+    //     width: 120,
+    //   },
+    // },
     {
       attrs: {
-        label: "备注",
-        slot: "remark",
-        width: 120,
+        label: "生产进度",
+        slot: "production",
+        "min-width": 250,
       },
     },
     {
@@ -736,6 +763,10 @@ const clickDownload = () => {
 ::v-deep(.el-input-number .el-input__inner) {
   text-align: left;
 }
+::v-deep(.el-progress__text) {
+  font-size: 15px !important;
+}
+
 .active {
   background: #a6dd82;
   color: #fff;

+ 16 - 12
src/views/finance/fundManage/accountStatement/index.vue

@@ -3,27 +3,31 @@
     <div class="content">
       <byTable :source="sourceList.data" :pagination="sourceList.pagination" :config="config" :loading="loading" :selectConfig="selectConfig"
                highlight-current-row :action-list="[
-          {
-            text: '添加借款',
-            action: () => addloan(),
-          },
+    
           {
             text: '导出Excel',
             action: () => deriveExcel(),
           },
-          {
-            text: '内部转账',
-            action: () => openTransferMoney('add'),
-          },
-          {
-            text: '退税登记',
-            action: () => openModalOne('add'),
-          },
+      
+   
           {
             text: '添加流水',
             action: () => openModal('add'),
           },
         ]" @get-list="getList">
+        <!-- {
+        text: '添加借款',
+        action: () => addloan(),
+
+        },
+        {
+        text: '内部转账',
+        action: () => openTransferMoney('add'),
+        },
+        {
+        text: '退税登记',
+        action: () => openModalOne('add'),
+        }, -->
         <!-- <template #amount="{ item }">
           <div :style="'color: ' + (item.status === '10' ? '#04cb04;' : 'red;')">
             <span style="padding-right: 4px">{{ item.currency }}</span>